From 37b2983b451f5dada95fcd137242e570081bc726 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 30 May 2019 15:03:37 +0300 Subject: [PATCH] Remove QT4 compatibility. --- CMakeLists.txt | 6 +----- src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx | 10 ++-------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 035490e..8e3e265 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 QtXml) - ELSE() - FIND_PACKAGE(SalomeQt5 REQUIRED) - ENDIF() + FIND_PACKAGE(SalomeQt5 REQUIRED) ENDIF(SALOME_BUILD_GUI) # VTK diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx index c9ebefb..7c0ea49 100644 --- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx @@ -530,11 +530,8 @@ QFrame* HYBRIDPluginGUI_HypothesisCreator::buildFrame() myEnforcedTableWidget->setAlternatingRowColors(true); myEnforcedTableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection); myEnforcedTableWidget->setSelectionBehavior(QAbstractItemView::SelectItems); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myEnforcedTableWidget->horizontalHeader()->setResizeMode(QHeaderView::Interactive); -#else myEnforcedTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); -#endif + myEnforcedTableWidget->resizeColumnsToContents(); myEnforcedTableWidget->hideColumn(ENF_VER_ENTRY_COLUMN); myEnforcedTableWidget->hideColumn(ENF_VER_COMPOUND_COLUMN); @@ -620,11 +617,8 @@ QFrame* HYBRIDPluginGUI_HypothesisCreator::buildFrame() << tr( "HYBRID_ENF_GROUP_COLUMN" ); myEnforcedMeshTableWidget->setHorizontalHeaderLabels(enforcedMeshHeaders); myEnforcedMeshTableWidget->horizontalHeader()->setStretchLastSection(true); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myEnforcedMeshTableWidget->horizontalHeader()->setResizeMode(QHeaderView::Interactive); -#else myEnforcedMeshTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); -#endif + myEnforcedMeshTableWidget->setAlternatingRowColors(true); myEnforcedMeshTableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection); myEnforcedMeshTableWidget->setSelectionBehavior(QAbstractItemView::SelectItems); -- 2.39.2