Commit of some improvements when running under Cygwin

* musredit can now be built using Qt 4.5.3 of Cygwin 1.7---however, without online help
* FFTW3 threading in some user functions has been disabled

Obviously, there is a major problem when running musrgui/musredit with Cygwin on Windows7/64bit.
This has not been solved by this commit!
This commit is contained in:
Bastian M. Wojek
2011-06-07 09:15:24 +00:00
parent a467ca9bcb
commit 02d5784b68
20 changed files with 82 additions and 87 deletions

View File

@@ -286,8 +286,12 @@ void PGetAsymmetryRunBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -107,9 +107,12 @@ void PGetDefaultDialog::setFileFormat(const QString &str)
*/
void PGetDefaultDialog::helpContent()
{
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
//---------------------------------------------------------------------------

View File

@@ -134,8 +134,12 @@ void PGetFourierBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -110,8 +110,12 @@ void PGetFunctionsBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -158,8 +158,12 @@ void PGetNonMusrRunBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -221,8 +221,12 @@ void PGetParameterBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -162,8 +162,12 @@ void PGetPlotBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -284,8 +284,12 @@ void PGetSingleHistoRunBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -128,8 +128,12 @@ void PGetTheoryBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -56,8 +56,12 @@ void PGetTitleBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -44,6 +44,7 @@
*/
PHelp::PHelp(const QString &url)
{
#ifndef _WIN32GCC
fProgress = 0;
QNetworkProxyFactory::setUseSystemConfiguration(true);
@@ -71,6 +72,7 @@ PHelp::PHelp(const QString &url)
setCentralWidget(fView);
setUnifiedTitleAndToolBarOnMac(true);
#endif // _WIN32GCC
}
//---------------------------------------------------------------------------

View File

@@ -64,6 +64,7 @@ class PHelp : public QMainWindow
QWebView *fView; ///< web viewer
QLineEdit *fLocationEdit; ///< url address line edit
int fProgress; ///< progress value (0-100) while loading an url
};
#endif // _PHELP_H_

View File

@@ -285,8 +285,12 @@ void PMsr2DataDialog::helpContent()
if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else {
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fHelpUrl);
help->show();
#endif // _WIN32GCC
}
}

View File

@@ -2198,9 +2198,12 @@ void PTextEdit::musrSwapMsrMlog()
*/
void PTextEdit::helpContents()
{
#ifdef _WIN32GCC
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
#else
PHelp *help = new PHelp(fAdmin->getHelpUrl("main"));
help->show();
#endif // _WIN32GCC
}
//----------------------------------------------------------------------------------------------------

View File

@@ -13,6 +13,7 @@ exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) {
}
exists( /usr/bin/cygwin1.dll ) {
QMAKE_CXXFLAGS += -D_WIN32GCC
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
}