From: vsr <vsr@opencascade.com>
Date: Mon, 4 Apr 2016 09:40:23 +0000 (+0300)
Subject: Merge remote branch 'origin/V7_dev'
X-Git-Tag: V8_1_0a1~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c3dc40d60668cb9d0b4fb0b4621cc87348af7bea;p=modules%2Fgui.git

Merge remote branch 'origin/V7_dev'
---

c3dc40d60668cb9d0b4fb0b4621cc87348af7bea
diff --cc src/SUITApp/CMakeLists.txt
index 404da384d,3d981ff69..7668604f5
--- a/src/SUITApp/CMakeLists.txt
+++ b/src/SUITApp/CMakeLists.txt
@@@ -99,10 -93,9 +93,9 @@@ ADD_LIBRARY(SUITApp ${SUITApp_SOURCES}
  TARGET_LINK_LIBRARIES(SUITApp ${_link_LIBRARIES})
  INSTALL(TARGETS SUITApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
  
- ADD_EXECUTABLE(TestSUITApp SUITApp.cxx)
- SET_TARGET_PROPERTIES(TestSUITApp PROPERTIES OUTPUT_NAME "SUITApp")
- TARGET_LINK_LIBRARIES(TestSUITApp ${_link_LIBRARIES} SUITApp)
- INSTALL(TARGETS TestSUITApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+ ADD_EXECUTABLE(suitexe SUITApp.cxx)
+ TARGET_LINK_LIBRARIES(suitexe ${_link_LIBRARIES} SUITApp)
+ INSTALL(TARGETS suitexe EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
  
  INSTALL(FILES ${SUITApp_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
diff --cc src/SUITApp/SUITApp_Application.cxx
index f3404c915,22a36dcc6..ad1fcf01c
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@@ -40,11 -40,7 +40,8 @@@
    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) && (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() ),
@@@ -59,14 -54,8 +55,10 @@@ 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 )
  {
  }
diff --cc src/SUITApp/SUITApp_Application.h
index f9507e8f9,7491d55a6..2941f9cdc
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.h
@@@ -50,15 -42,13 +42,15 @@@ class SUITAPP_EXPORT SUITApp_Applicatio
    Q_OBJECT
  
  public:
-   SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* = 0 );
+   SUITApp_Application( int&, char**, SUIT_ExceptionHandler* = 0 );
 +// 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( int& argc, char** argv, Type type, SUIT_ExceptionHandler* = 0 );
+   SUITApp_Application( int&, char**, Type, SUIT_ExceptionHandler* = 0 );
 -
 +#endif
    virtual bool notify( QObject* receiver, QEvent* e );
  
-         SUIT_ExceptionHandler* handler() const;
-         void                   setHandler( SUIT_ExceptionHandler* );
+   SUIT_ExceptionHandler* handler() const;
+   void                   setHandler( SUIT_ExceptionHandler* );
  
  private:
    SUIT_ExceptionHandler* myExceptHandler;
diff --cc src/Session/SALOME_Session_Server.cxx
index 0b10352e2,4b583e818..f7b2c2c41
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@@ -247,19 -238,11 +243,12 @@@ public
    }
  };
  
- #ifdef ENABLE_TESTRECORDER
-   class SALOME_QApplication : public TestApplication
- #else
-   class SALOME_QApplication : public QApplication
- #endif
+ class SALOME_QApplication : public QApplication
  {
  public:
- #ifdef ENABLE_TESTRECORDER
-   SALOME_QApplication( int& argc, char** argv ) : TestApplication( argc, argv ), myHandler ( 0 ) {}
- #else
    SALOME_QApplication( int& argc, char** argv )
 -#ifndef WIN32
 +// 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)
    // 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() ),