From 65022aa8ea7f7ea7dc684836028bb656f0c65271 Mon Sep 17 00:00:00 2001 From: imn Date: Thu, 26 Nov 2015 17:42:50 +0300 Subject: [PATCH] Migrate to Qt 5 --- CMakeLists.txt | 8 ++++++-- src/GUI/CMakeLists.txt | 8 ++++---- src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx | 8 ++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4b1186..388d857 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,8 +106,12 @@ ENDIF(SALOME_BUILD_GUI) ## IF(SALOME_BUILD_GUI) - # Qt4 - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) + # Qt + IF(NOT SALOME_GUI_BUILD_WITH_QT5) + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) + ELSE() + FIND_PACKAGE(SalomeQt5 REQUIRED) + ENDIF() ENDIF(SALOME_BUILD_GUI) # OCCT FIND_PACKAGE(SalomeCAS REQUIRED) diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index f8df076..7d6e1a6 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UseQt4Ext) +INCLUDE(UseQtExt) # --- options --- # additional include directories @@ -77,7 +77,7 @@ SET(GHS3DPluginGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) # sources / static SET(_other_SOURCES @@ -102,7 +102,7 @@ SET(_uic_files ) # header files / uic wrappings -QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) +QT_WRAP_UIC(_uic_HEADERS ${_uic_files}) # sources / to compile SET(GHS3DPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS}) @@ -114,4 +114,4 @@ TARGET_LINK_LIBRARIES(GHS3DPluginGUI ${_link_LIBRARIES} ) INSTALL(TARGETS GHS3DPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(FILES ${GHS3DPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPLUGIN_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPLUGIN_INSTALL_RES_DATA}") diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx index 6dd1db9..6a74734 100644 --- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx @@ -464,7 +464,11 @@ QFrame* GHS3DPluginGUI_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); @@ -551,7 +555,11 @@ QFrame* GHS3DPluginGUI_HypothesisCreator::buildFrame() << tr( "GHS3D_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