X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUITApp%2FSUITApp_Application.cxx;h=f1590699562b1e2bd2c6740e517b1aeacc903116;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=f3404c915881d88894f9d61461a0a4a0bb4049ac;hpb=d6bd12111347879cd8dbe1a15ac4d6ba32ce0d6b;p=modules%2Fgui.git diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx index f3404c915..f15906995 100644 --- a/src/SUITApp/SUITApp_Application.cxx +++ b/src/SUITApp/SUITApp_Application.cxx @@ -40,18 +40,14 @@ Constructor */ SUITApp_Application::SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* hand ) -#ifdef ENABLE_TESTRECORDER - : TestApplication( argc, argv ), -#else // TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5 -#if !defined(WIN32) && (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) +#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 ) { } @@ -62,11 +58,7 @@ myExceptHandler( hand ) // 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 ) { } @@ -80,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 } /*!