From a2ba6c2904684f7829273bfacaaa550710e3caa5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 23 Jul 2014 16:53:43 +0200 Subject: [PATCH] Support for Windows/Cygwin, part 3. * Change: In CRL Core/Cyclop, Hurricane/PyHApplication and vlsisapd/ConfEditorMain, disable the use of GtkStyle under Cygwin. --- crlcore/src/cyclop/CyclopMain.cpp | 4 ++-- hurricane/src/viewer/PyHApplication.cpp | 4 ++-- unicorn/src/CgtMain.cpp | 4 ++-- vlsisapd/src/configuration/src/ConfEditorMain.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crlcore/src/cyclop/CyclopMain.cpp b/crlcore/src/cyclop/CyclopMain.cpp index ebe4214d..0999f220 100644 --- a/crlcore/src/cyclop/CyclopMain.cpp +++ b/crlcore/src/cyclop/CyclopMain.cpp @@ -25,7 +25,7 @@ namespace boptions = boost::program_options; #include #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 #endif @@ -199,7 +199,7 @@ int main ( int argc, char *argv[] ) auto_ptr 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 (); diff --git a/hurricane/src/viewer/PyHApplication.cpp b/hurricane/src/viewer/PyHApplication.cpp index 737bfeb9..f6f10438 100644 --- a/hurricane/src/viewer/PyHApplication.cpp +++ b/hurricane/src/viewer/PyHApplication.cpp @@ -19,7 +19,7 @@ #include #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 #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 diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp index 4070bdeb..1fb4113d 100644 --- a/unicorn/src/CgtMain.cpp +++ b/unicorn/src/CgtMain.cpp @@ -36,7 +36,7 @@ namespace bopts = boost::program_options; #include #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 #endif @@ -319,7 +319,7 @@ int main ( int argc, char *argv[] ) auto_ptr 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 (); diff --git a/vlsisapd/src/configuration/src/ConfEditorMain.cpp b/vlsisapd/src/configuration/src/ConfEditorMain.cpp index 52507dbd..5f64af49 100644 --- a/vlsisapd/src/configuration/src/ConfEditorMain.cpp +++ b/vlsisapd/src/configuration/src/ConfEditorMain.cpp @@ -26,7 +26,7 @@ namespace boptions = boost::program_options; #include #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 #endif #include "vlsisapd/utilities/Path.h" @@ -66,7 +66,7 @@ int main ( int argc, char* argv[] ) auto_ptr 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