Remove QT4 compatibility.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 035490e4442ed4786b4534606bfaf1f1871c6aba..8e3e265e9c44f9bc0002e349f1fb53e650644312 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 QtXml)
-  ELSE()
-    FIND_PACKAGE(SalomeQt5 REQUIRED)
-  ENDIF()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF(SALOME_BUILD_GUI)
 
 # VTK

diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx
index c9ebefbe866330ad04fad65b3ab13436a713feda..7c0ea49df162ca131a03d4e86c9d2578a38f6b75 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx
@@ -530,11 +530,8 @@ QFrame* HYBRIDPluginGUI_HypothesisCreator::buildFrame()
   myEnforcedTableWidget->setAlternatingRowColors(true);
   myEnforcedTableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
   myEnforcedTableWidget->setSelectionBehavior(QAbstractItemView::SelectItems);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  myEnforcedTableWidget->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
-#else
   myEnforcedTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
-#endif
+
   myEnforcedTableWidget->resizeColumnsToContents();
   myEnforcedTableWidget->hideColumn(ENF_VER_ENTRY_COLUMN);
   myEnforcedTableWidget->hideColumn(ENF_VER_COMPOUND_COLUMN);
@@ -620,11 +617,8 @@ QFrame* HYBRIDPluginGUI_HypothesisCreator::buildFrame()
                       << tr( "HYBRID_ENF_GROUP_COLUMN" );
   myEnforcedMeshTableWidget->setHorizontalHeaderLabels(enforcedMeshHeaders);
   myEnforcedMeshTableWidget->horizontalHeader()->setStretchLastSection(true);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  myEnforcedMeshTableWidget->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
-#else
   myEnforcedMeshTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
-#endif
+
   myEnforcedMeshTableWidget->setAlternatingRowColors(true);
   myEnforcedMeshTableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
   myEnforcedMeshTableWidget->setSelectionBehavior(QAbstractItemView::SelectItems);