From de3e0ec062a1ffd253abadc65aff734d58c6a1c3 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 30 May 2019 15:11:32 +0300 Subject: [PATCH] Remove QT4 compatibility. --- CMakeLists.txt | 12 ++---------- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 4 ---- src/SMESHGUI/SMESHGUI_MeshInfo.cxx | 8 -------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95d1ef7e2..147ce7f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,19 +151,11 @@ IF(SALOME_BUILD_GUI) ## Prerequisites From 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) # SIP FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5 # PyQt - IF (NOT SALOME_GUI_BUILD_WITH_QT5) - FIND_PACKAGE(SalomePyQt4 REQUIRED) - ELSE() - FIND_PACKAGE(SalomePyQt5 REQUIRED) - ENDIF() + FIND_PACKAGE(SalomePyQt5 REQUIRED) # Qwt FIND_PACKAGE(SalomeQwt REQUIRED) ELSE(EXISTS ${GUI_ROOT_DIR}) diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index 38f59d9a8..246adbfbb 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -575,11 +575,7 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent, bool ForEval) myTable->hideColumn( COL_PUBLISHED ); myTable->hideColumn( COL_SHAPEID ); myTable->hideColumn( COL_BAD_MESH ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myTable->horizontalHeader()->setResizeMode( COL_ERROR, QHeaderView::Interactive ); -#else myTable->horizontalHeader()->setSectionResizeMode( COL_ERROR, QHeaderView::Interactive ); -#endif myTable->setWordWrap( true ); myTable->horizontalHeader()->setStretchLastSection( true ); myTable->setMinimumWidth( 500 ); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index fc5ac8b73..142f41ad5 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -2147,11 +2147,7 @@ SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent ) myInfo->setColumnCount( 2 ); myInfo->setHeaderLabels( QStringList() << tr( "PROPERTY" ) << tr( "VALUE" ) ); myInfo->header()->setStretchLastSection( true ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myInfo->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); -#else myInfo->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); -#endif myInfo->setItemDelegate( new ItemDelegate( myInfo ) ); QVBoxLayout* l = new QVBoxLayout( centralWidget() ); l->setMargin( 0 ); @@ -2379,11 +2375,7 @@ SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent ): SMESHGUI_Info( parent ) myTree->setColumnCount( 2 ); myTree->header()->setStretchLastSection( true ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myTree->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); -#else myTree->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); -#endif myTree->header()->hide(); l->addWidget( myTree ); -- 2.30.2