ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 17:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove QT4 compatibility.

Browse Source
This commit is contained in:
rnv 2019-05-30 15:11:32 +03:00
parent 7b4bb082fa
commit de3e0ec062
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -151,19 +151,11 @@ IF(SALOME_BUILD_GUI)
## Prerequisites From GUI: ## Prerequisites From GUI:
## ##
# Qt # Qt
IF(NOT SALOME_GUI_BUILD_WITH_QT5)
FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
ELSE()
FIND_PACKAGE(SalomeQt5 REQUIRED) FIND_PACKAGE(SalomeQt5 REQUIRED)
ENDIF()
# SIP # SIP
FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5 FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5
# PyQt # PyQt
IF (NOT SALOME_GUI_BUILD_WITH_QT5)
FIND_PACKAGE(SalomePyQt4 REQUIRED)
ELSE()
FIND_PACKAGE(SalomePyQt5 REQUIRED) FIND_PACKAGE(SalomePyQt5 REQUIRED)
ENDIF()
# Qwt # Qwt
FIND_PACKAGE(SalomeQwt REQUIRED) FIND_PACKAGE(SalomeQwt REQUIRED)
ELSE(EXISTS ${GUI_ROOT_DIR}) ELSE(EXISTS ${GUI_ROOT_DIR})

4
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -575,11 +575,7 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent, bool ForEval)
myTable->hideColumn( COL_PUBLISHED ); myTable->hideColumn( COL_PUBLISHED );
myTable->hideColumn( COL_SHAPEID ); myTable->hideColumn( COL_SHAPEID );
myTable->hideColumn( COL_BAD_MESH ); 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 ); myTable->horizontalHeader()->setSectionResizeMode( COL_ERROR, QHeaderView::Interactive );
#endif
myTable->setWordWrap( true ); myTable->setWordWrap( true );
myTable->horizontalHeader()->setStretchLastSection( true ); myTable->horizontalHeader()->setStretchLastSection( true );
myTable->setMinimumWidth( 500 ); myTable->setMinimumWidth( 500 );

8
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
View File

@ -2147,11 +2147,7 @@ SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent )
myInfo->setColumnCount( 2 ); myInfo->setColumnCount( 2 );
myInfo->setHeaderLabels( QStringList() << tr( "PROPERTY" ) << tr( "VALUE" ) ); myInfo->setHeaderLabels( QStringList() << tr( "PROPERTY" ) << tr( "VALUE" ) );
myInfo->header()->setStretchLastSection( true ); 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 ); myInfo->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
#endif
myInfo->setItemDelegate( new ItemDelegate( myInfo ) ); myInfo->setItemDelegate( new ItemDelegate( myInfo ) );
QVBoxLayout* l = new QVBoxLayout( centralWidget() ); QVBoxLayout* l = new QVBoxLayout( centralWidget() );
l->setMargin( 0 ); l->setMargin( 0 );
@ -2379,11 +2375,7 @@ SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent ): SMESHGUI_Info( parent )
myTree->setColumnCount( 2 ); myTree->setColumnCount( 2 );
myTree->header()->setStretchLastSection( true ); 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 ); myTree->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
#endif
myTree->header()->hide(); myTree->header()->hide();
l->addWidget( myTree ); l->addWidget( myTree );