From 614469e8127f264f76cdad699f5b5d81810c8463 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 30 May 2019 15:07:23 +0300 Subject: [PATCH] Remove QT4 compatibility. --- CMakeLists.txt | 6 +----- src/GUI/NETGENPluginGUI_HypothesisCreator.cxx | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08aa817..ed62da4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,11 +117,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/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx index 037948a..cf7d76b 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx @@ -413,11 +413,8 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame() localSizeHeaders << tr( "LSZ_ENTRY_COLUMN" )<< tr( "LSZ_NAME_COLUMN" ) << tr( "LSZ_LOCALSIZE_COLUMN" ); myLocalSizeTable->setHorizontalHeaderLabels(localSizeHeaders); myLocalSizeTable->horizontalHeader()->hideSection(LSZ_ENTRY_COLUMN); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myLocalSizeTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive); -#else myLocalSizeTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); -#endif + myLocalSizeTable->resizeColumnToContents(LSZ_NAME_COLUMN); myLocalSizeTable->resizeColumnToContents(LSZ_LOCALSIZE_COLUMN); myLocalSizeTable->setAlternatingRowColors(true); -- 2.39.2