Remove QT4 compatibility.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 580a1eaca58acdf9eeba3df85183e8c53ccd3ba7..25fc08c03c051b4a9239f6792b1661b2ee1e7eea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,11 +119,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

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index 1f5d3b31253e88dea2e18d50b9a0d0cf38f41045..4ff245c730c821a7a7ef81239e389bea153f82ea 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -846,11 +846,7 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   myEnforcedTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
   myEnforcedTreeWidget->setSelectionBehavior(QAbstractItemView::SelectItems);
   for (int column = 0; column < ENF_VER_NB_COLUMNS; ++column) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    myEnforcedTreeWidget->header()->setResizeMode(column,QHeaderView::Interactive);
-#else
     myEnforcedTreeWidget->header()->setSectionResizeMode(column,QHeaderView::Interactive);
-#endif
     myEnforcedTreeWidget->resizeColumnToContents(column);
   }
   myEnforcedTreeWidget->hideColumn(ENF_VER_FACE_ENTRY_COLUMN);
@@ -960,11 +956,7 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   
   size_t periodicityVisibleColumns = 2;
   for (size_t column = 0; column < periodicityVisibleColumns; ++column) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-      myPeriodicityTreeWidget->header()->setResizeMode(column,QHeaderView::Interactive);
-#else
       myPeriodicityTreeWidget->header()->setSectionResizeMode(column,QHeaderView::Interactive);
-#endif
       myPeriodicityTreeWidget->resizeColumnToContents(column);
   }
   myPeriodicityTreeWidget->header()->setStretchLastSection(true);