From: rnv Date: Thu, 30 May 2019 12:02:17 +0000 (+0300) Subject: Remove QT4 compatibility. X-Git-Tag: V9_4_0a2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=55d727b46b73db78ac7271d0ed8616a5cecc44b5;p=plugins%2Fhexablockplugin.git Remove QT4 compatibility. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index de6cbd1..262258a 100644 --- 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 1dd579e..73d8fd6 100644 --- 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);