Remove QT4 compatibility.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1303ff741163c36e3bc7f1124155363de4dde82d..3f73cf51040429386bb9be8cc273f88c119cba4f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,11 +173,7 @@ IF(SALOME_BUILD_GUI)
   # Graphviz
   FIND_PACKAGE(SalomeGraphviz  REQUIRED)
   # Qt
-  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-  ELSE()
-    FIND_PACKAGE(SalomeQt5 REQUIRED)
-  ENDIF()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF(SALOME_BUILD_GUI)
 
 ##
@@ -326,20 +322,12 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #      Ensure the variables are always defined for the configure:
 SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
 SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-  SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
-ELSE()
-  SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
-ENDIF()
+SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-  SALOME_CONFIGURE_PREPARE(Qt4)
-ELSE()
-  SALOME_CONFIGURE_PREPARE(Qt5)
-ENDIF()
+SALOME_CONFIGURE_PREPARE(Qt5)
 
 CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake

diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx
index 6629624cdda51fb49fbcf1436c18343b05c36335..cbcc9c110b9bd46ade940eaec8946fa142d2fa0f 100644 (file)
--- a/src/genericgui/GenericGui.cxx
+++ b/src/genericgui/GenericGui.cxx
@@ -174,9 +174,7 @@ GenericGui::GenericGui(YACS::HMI::SuitWrapper* wrapper, QMainWindow *parent)
   _parent->tabifyDockWidget(_dwStacked, _dwCatalogs);
   if (_wrapper->objectBrowser())
     _parent->tabifyDockWidget(_dwTree, _wrapper->objectBrowser());
-#if QT_VERSION >= 0x040500
   _parent->setTabPosition(Qt::AllDockWidgetAreas, Resource::tabPanelsUp? QTabWidget::North: QTabWidget::South);
-#endif
   //Import user catalog
   std::string usercata=Resource::userCatalog.toStdString();
   _catalogsWidget->addCatalogFromFile(usercata);