From: rnv Date: Fri, 31 May 2019 12:58:02 +0000 (+0300) Subject: Remove QT4 compatibility. X-Git-Tag: V9_4_0a1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2Fremove_qt4compat;p=plugins%2Fgmshplugin.git Remove QT4 compatibility. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c3ce1ba..db489b9 100644 --- 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 477727f..66b46f2 100644 --- 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();