Remove QT4 compatibility.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3ce1ba5fafaa6f18e16664ababe0e9b19d7d1d4..db489b9016e5de1be073da1924f825fb5a0897b3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,11 +122,7 @@ ENDIF(SALOME_BUILD_GUI)
 
 IF(SALOME_BUILD_GUI)
   # 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)
 # OCCT
 FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)

diff --git a/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx b/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx
index 477727fe8ba8ad9b4976303b1050cfaa3b7e32a3..66b46f28366e8f361c198ddb3cb6ce34440e2b87 100644 (file)
--- a/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GMSHPluginGUI_HypothesisCreator.cxx
@@ -247,11 +247,7 @@ QFrame* GMSHPluginGUI_HypothesisCreator::buildFrame()
   compoundHeaders << tr( "GMSH_COMPOUND_ENTRY_COLUMN" ) << tr( "GMSH_COMPOUND_NAME_COLUMN" );
   myCompoundTable->setHorizontalHeaderLabels(compoundHeaders);
   myCompoundTable->horizontalHeader()->hideSection(0);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  myCompoundTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
-#else
   myCompoundTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
-#endif
   myCompoundTable->resizeColumnToContents(1);
   myCompoundTable->setAlternatingRowColors(true);
   myCompoundTable->verticalHeader()->hide();