Remove QT4 compatibility.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de6cbd1f8c083dee6c4e4be8919eab11c588323e..262258a32dc84728061582bfd4b27f47936c9ba5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,11 +101,7 @@ IF(SALOME_BUILD_GUI)
     FIND_PACKAGE(SalomeGUI)
     SALOME_GUI_WITH_CORBA() #check whether GUI builded with CORBA
     # 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)
   ELSE(EXISTS ${GUI_ROOT_DIR})
     MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
   ENDIF(EXISTS ${GUI_ROOT_DIR})

diff --git a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx
index 1dd579e9d1a8179de6c2a403cef9b5916a97139e..73d8fd69e452138efa373ed51682458b4453f95c 100644 (file)
--- a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx
@@ -309,11 +309,8 @@ QFrame* HEXABLOCKPluginGUI_HypothesisCreator::buildFrame()
   mySmpModel->setHorizontalHeaderLabels(enforcedHeaders);
   myEnforcedTableView->setAlternatingRowColors(true);
   myEnforcedTableView->verticalHeader()->hide();
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  myEnforcedTableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
-#else
   myEnforcedTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-#endif
+
   QLabel* myXCoordLabel = new QLabel( tr( "HEXABLOCK_ENF_VER_X_LABEL" ), myEnfGroup );
   anSmpLayout->addWidget(myXCoordLabel, ENF_VER_X_COORD, 1, 1, 1);
   myXCoord = new QLineEdit(myEnfGroup);