jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support for Windows/Cygwin, part 3. 

* Change: In CRL Core/Cyclop, Hurricane/PyHApplication and vlsisapd/ConfEditorMain,
    disable the use of GtkStyle under Cygwin.
This commit is contained in:
Jean-Paul Chaput 2014-07-23 16:53:43 +02:00
parent 09f515c62a
commit a2ba6c2904
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crlcore/src/cyclop/CyclopMain.cpp
View File

@ -25,7 +25,7 @@ namespace boptions = boost::program_options;
#include <QtGui>
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
# include <QGtkStyle>
#endif
@ -199,7 +199,7 @@ int main ( int argc, char *argv[] )
auto_ptr<QApplication> qa ( new HApplication(argc,argv) );
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
qa->setStyle ( new QGtkStyle() );
#endif
Graphics::enable ();

4
hurricane/src/viewer/PyHApplication.cpp
View File

@ -19,7 +19,7 @@
#include <QtGui>
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined(__CYGWIN__)
# include <QGtkStyle>
#endif
@ -100,7 +100,7 @@ extern "C" {
ha = new HApplication(argc,argv);
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
ha->setStyle ( new QGtkStyle() );
#endif

4
unicorn/src/CgtMain.cpp
View File

@ -36,7 +36,7 @@ namespace bopts = boost::program_options;
#include <QtGui>
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
# include <QGtkStyle>
#endif
@ -319,7 +319,7 @@ int main ( int argc, char *argv[] )
auto_ptr<QApplication> qa ( new HApplication(argc,argv) );
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
qa->setStyle ( new QGtkStyle() );
#endif
Graphics::enable ();

4
vlsisapd/src/configuration/src/ConfEditorMain.cpp
View File

@ -26,7 +26,7 @@ namespace boptions = boost::program_options;
#include <QApplication>
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
# include <QGtkStyle>
#endif
#include "vlsisapd/utilities/Path.h"
@ -66,7 +66,7 @@ int main ( int argc, char* argv[] )
auto_ptr<QApplication> qa ( new QApplication(argc,argv) );
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and \
(QT_VERSION < QT_VERSION_CHECK(5,0,0)) and \
not defined (__APPLE__)
not defined (__APPLE__) and not defined (__CYGWIN__)
if ( not disableGtkStyle ) qa->setStyle ( new QGtkStyle() );
#endif