Merge branch 'V7_dev'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec1b6014f78fdc455f8545ecc12782cea644b5bb..215f38eb2c9a737aa323c324dc77ca80aba7fcc6 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -106,8 +106,12 @@ ENDIF(SALOME_BUILD_GUI)
 ## From 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

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index d49376c43d52807525cda03c75dd11e8b918e912..1fe4352a45513f9aad72aba42aa9018a6320f32e 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -846,7 +846,11 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   myEnforcedTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
   myEnforcedTreeWidget->setSelectionBehavior(QAbstractItemView::SelectItems);
   for (int column = 0; column < ENF_VER_NB_COLUMNS; ++column) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     myEnforcedTreeWidget->header()->setResizeMode(column,QHeaderView::Interactive);
+#else
+    myEnforcedTreeWidget->header()->setSectionResizeMode(column,QHeaderView::Interactive);
+#endif
     myEnforcedTreeWidget->resizeColumnToContents(column);
   }
   myEnforcedTreeWidget->hideColumn(ENF_VER_FACE_ENTRY_COLUMN);
@@ -963,7 +967,11 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   
   size_t periodicityVisibleColumns = 2;
   for (size_t column = 0; column < periodicityVisibleColumns; ++column) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
       myPeriodicityTreeWidget->header()->setResizeMode(column,QHeaderView::Interactive);
+#else
+      myPeriodicityTreeWidget->header()->setSectionResizeMode(column,QHeaderView::Interactive);
+#endif
       myPeriodicityTreeWidget->resizeColumnToContents(column);
   }
   myPeriodicityTreeWidget->header()->setStretchLastSection(true);

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index e3a7791cc5f6405d3fe41031da92756f6b85669e..11722753e12156cf33cd961c329becc6c5676397 100644 (file)
--- 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
@@ -78,7 +78,7 @@ SET(BLSURFPluginGUI_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${BLSURFPluginGUI_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${BLSURFPluginGUI_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -105,7 +105,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(BLSURFPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
@@ -118,4 +118,4 @@ INSTALL(TARGETS BLSURFPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
 
 INSTALL(FILES ${BLSURFPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_BLSURFPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_BLSURFPLUGIN_INSTALL_RES_DATA}")