Patch for MacOS (from SALOME forum)

[modules/gui.git] / src / SUITApp / SUITApp_Application.cxx

diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index e2b68f74165a8087ad7d1c305f851719f0cca09d..f1590699562b1e2bd2c6740e517b1aeacc903116 100644 (file)
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@ -40,17 +40,14 @@
   Constructor
 */
 SUITApp_Application::SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* hand )
-#ifdef ENABLE_TESTRECORDER
-  : TestApplication( argc, argv ),
-#else
-#ifndef WIN32
+// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
+#if !defined(WIN32) && !defined(__APPLE__) && (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
   // san: Opening an X display and choosing a visual most suitable for 3D visualization
   // in order to make SALOME viewers work with non-native X servers
   : QApplication( (Display*)Qtx::getDisplay(), argc, argv, Qtx::getVisual() ),
 #else
   : QApplication( argc, argv ), 
 #endif
-#endif
 myExceptHandler( hand )
 {
 }
@@ -58,16 +55,14 @@ myExceptHandler( hand )
 /*!
   Constructor
 */
+// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 SUITApp_Application::SUITApp_Application( int& argc, char** argv, Type type, SUIT_ExceptionHandler* hand )
-#ifdef ENABLE_TESTRECORDER
-  : TestApplication( argc, argv ),
-#else
   : QApplication( argc, argv, type ),
-#endif
 myExceptHandler( hand )
 {
 }
-
+#endif
 /*!
   Sends event to receiver
   \return the value that is returned from the receiver's event handler
@@ -77,11 +72,7 @@ myExceptHandler( hand )
 bool SUITApp_Application::notify( QObject* receiver, QEvent* e )
 {
   return myExceptHandler ? myExceptHandler->handle( receiver, e ) :
-#ifdef ENABLE_TESTRECORDER
-                           TestApplication::notify( receiver, e );
-#else
                            QApplication::notify( receiver, e );
-#endif
 }
 
 /*!