X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUITApp%2FSUITApp_Application.cxx;h=6e89be1fefccba71e3d36adeffc502f6f504a095;hb=5015bf4f1283a8ca5d6ab862f235322755cb7be9;hp=7864c19d5fb46420db8787430fbd8cc575987533;hpb=53415443fa7c248984f053da559cc8765623088c;p=modules%2Fgui.git diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx index 7864c19d5..6e89be1fe 100644 --- a/src/SUITApp/SUITApp_Application.cxx +++ b/src/SUITApp/SUITApp_Application.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -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 } /*!