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

@ -731,6 +731,7 @@ LOCAL_LIB_LDFLAGS=
case "$host" in case "$host" in
*-*-cygwin) *-*-cygwin)
ARCH=CYGWIN ARCH=CYGWIN
AC_DEFINE([_WIN32GCC], [1], [Define to 1 if host system is Cygwin])
LOCAL_BIN_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}" LOCAL_BIN_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}"
LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS} -D_DLL" LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS} -D_DLL"
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_WIN32GCC" LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_WIN32GCC"

View File

@ -135,16 +135,12 @@ TBulkTriVortexLondonFieldCalc::TBulkTriVortexLondonFieldCalc(const string& wisdo
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -318,16 +314,12 @@ TBulkSqVortexLondonFieldCalc::TBulkSqVortexLondonFieldCalc(const string& wisdom,
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -469,16 +461,12 @@ TBulkTriVortexMLFieldCalc::TBulkTriVortexMLFieldCalc(const string& wisdom, const
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -669,16 +657,12 @@ TBulkTriVortexAGLFieldCalc::TBulkTriVortexAGLFieldCalc(const string& wisdom, con
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -878,16 +862,12 @@ TBulkTriVortexAGLIIFieldCalc::TBulkTriVortexAGLIIFieldCalc(const string& wisdom,
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -1100,16 +1080,12 @@ TBulkTriVortexNGLFieldCalc::TBulkTriVortexNGLFieldCalc(const string& wisdom, con
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
const unsigned int stepsSq(fSteps*fSteps); const unsigned int stepsSq(fSteps*fSteps);
@ -2374,16 +2350,12 @@ TBulkAnisotropicTriVortexLondonFieldCalc::TBulkAnisotropicTriVortexLondonFieldCa
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -2595,16 +2567,12 @@ TBulkAnisotropicTriVortexMLFieldCalc::TBulkAnisotropicTriVortexMLFieldCalc(const
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];
@ -2798,16 +2766,12 @@ TBulkAnisotropicTriVortexAGLFieldCalc::TBulkAnisotropicTriVortexAGLFieldCalc(con
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps]; fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps]; fFFTout = new double[fSteps*fSteps];

View File

@ -155,16 +155,12 @@ TFilmTriVortexNGLFieldCalc::TFilmTriVortexNGLFieldCalc(const string& wisdom, con
fParam.resize(3); fParam.resize(3);
fGridExists = false; fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3F_THREADS) && defined(HAVE_GOMP)
int init_threads(fftwf_init_threads()); int init_threads(fftwf_init_threads());
if (init_threads) { if (init_threads) {
#ifdef HAVE_GOMP
fftwf_plan_with_nthreads(omp_get_num_procs()); fftwf_plan_with_nthreads(omp_get_num_procs());
#else
fftwf_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
} }
#endif /* HAVE_LIBFFTW3_THREADS */ #endif
const unsigned int stepsSqStZ(fSteps*fSteps*fStepsZ); const unsigned int stepsSqStZ(fSteps*fSteps*fStepsZ);

View File

@ -70,19 +70,13 @@
TPofTCalc::TPofTCalc (const TPofBCalc *PofB, const string &wisdom, const vector<double> &par) : fWisdom(wisdom) { TPofTCalc::TPofTCalc (const TPofBCalc *PofB, const string &wisdom, const vector<double> &par) : fWisdom(wisdom) {
#if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3_THREADS) && defined(HAVE_GOMP)
#ifdef HAVE_LIBFFTW3_THREADS
int init_threads(fftw_init_threads()); int init_threads(fftw_init_threads());
if (!init_threads) if (!init_threads)
cout << "TPofTCalc::TPofTCalc: Couldn't initialize multiple FFTW-threads ..." << endl; cout << "TPofTCalc::TPofTCalc: Couldn't initialize multiple FFTW-threads ..." << endl;
else { else
#ifdef HAVE_GOMP
fftw_plan_with_nthreads(omp_get_num_procs()); fftw_plan_with_nthreads(omp_get_num_procs());
#else #endif
fftw_plan_with_nthreads(2);
#endif /* HAVE_GOMP */
}
#endif /* HAVE_LIBFFTW3_THREADS */
fNFFT = static_cast<int>(1.0/(gBar*par[1]*par[2])); fNFFT = static_cast<int>(1.0/(gBar*par[1]*par[2]));
if (fNFFT % 2) { if (fNFFT % 2) {

View File

@ -187,18 +187,13 @@ double TLFStatExpKT::operator()(double t, const vector<double> &par) const {
*/ */
TLFDynGssKT::TLFDynGssKT() : fCalcNeeded(true), fFirstCall(true), fCounter(0) { TLFDynGssKT::TLFDynGssKT() : fCalcNeeded(true), fFirstCall(true), fCounter(0) {
#ifdef HAVE_LIBFFTW3F_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3F_THREADS) && defined(HAVE_GOMP)
int init_threads(fftwf_init_threads()); int init_threads(fftwf_init_threads());
if (!init_threads) if (!init_threads)
cout << "TLFDynGssKT::TLFDynGssKT: Couldn't initialize multiple FFTW-threads ..." << endl; cout << "TLFDynGssKT::TLFDynGssKT: Couldn't initialize multiple FFTW-threads ..." << endl;
else { else
#ifdef HAVE_GOMP
fftwf_plan_with_nthreads(omp_get_num_procs()); fftwf_plan_with_nthreads(omp_get_num_procs());
#else #endif
fftwf_plan_with_nthreads(1);
#endif /* HAVE_GOMP */
}
#endif /* HAVE_LIBFFTW3F_THREADS */
// read startup file // read startup file
string startup_path_name("BMW_startup.xml"); string startup_path_name("BMW_startup.xml");
@ -514,18 +509,13 @@ double TLFDynSG::operator()(double t, const vector<double> &par) const {
*/ */
TLFDynExpKT::TLFDynExpKT() : fCalcNeeded(true), fFirstCall(true), fCounter(0), fL1(0.0), fL2(0.0) { TLFDynExpKT::TLFDynExpKT() : fCalcNeeded(true), fFirstCall(true), fCounter(0), fL1(0.0), fL2(0.0) {
#ifdef HAVE_LIBFFTW3F_THREADS #if !defined(_WIN32GCC) && defined(HAVE_LIBFFTW3F_THREADS) && defined(HAVE_GOMP)
int init_threads(fftwf_init_threads()); int init_threads(fftwf_init_threads());
if (!init_threads) if (!init_threads)
cout << "TLFDynExpKT::TLFDynExpKT: Couldn't initialize multiple FFTW-threads ..." << endl; cout << "TLFDynExpKT::TLFDynExpKT: Couldn't initialize multiple FFTW-threads ..." << endl;
else { else
#ifdef HAVE_GOMP
fftwf_plan_with_nthreads(omp_get_num_procs()); fftwf_plan_with_nthreads(omp_get_num_procs());
#else #endif
fftwf_plan_with_nthreads(1);
#endif /* HAVE_GOMP */
}
#endif /* HAVE_LIBFFTW3F_THREADS */
// read startup file // read startup file
string startup_path_name("BMW_startup.xml"); string startup_path_name("BMW_startup.xml");

View File

@ -286,8 +286,12 @@ void PGetAsymmetryRunBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -107,9 +107,12 @@ void PGetDefaultDialog::setFileFormat(const QString &str)
*/ */
void PGetDefaultDialog::helpContent() 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

View File

@ -134,8 +134,12 @@ void PGetFourierBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -110,8 +110,12 @@ void PGetFunctionsBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -158,8 +158,12 @@ void PGetNonMusrRunBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -221,8 +221,12 @@ void PGetParameterBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -162,8 +162,12 @@ void PGetPlotBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -284,8 +284,12 @@ void PGetSingleHistoRunBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -128,8 +128,12 @@ void PGetTheoryBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -56,8 +56,12 @@ void PGetTitleBlockDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

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

View File

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

View File

@ -285,8 +285,12 @@ void PMsr2DataDialog::helpContent()
if (fHelpUrl.isEmpty()) { if (fHelpUrl.isEmpty()) {
QMessageBox::information(this, "**INFO**", "Will eventually show a help window"); QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
} else { } 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); PHelp *help = new PHelp(fHelpUrl);
help->show(); help->show();
#endif // _WIN32GCC
} }
} }

View File

@ -2198,9 +2198,12 @@ void PTextEdit::musrSwapMsrMlog()
*/ */
void PTextEdit::helpContents() 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")); PHelp *help = new PHelp(fAdmin->getHelpUrl("main"));
help->show(); help->show();
#endif // _WIN32GCC
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------

View File

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