Merge branch 'V7_dev'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e00257417aa7ed9eb30f67c8cda77f50545de66..ab5db6681862dcf352bb8db25cf29ccc3dfb323f 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})
@@ -104,8 +104,12 @@ IF(SALOME_BUILD_GUI)
                     OPTIONAL SALOME_USE_PYCONSOLE)
     ADD_DEFINITIONS(${GUI_DEFINITIONS})
     # Various
-    # 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()
   ELSE(EXISTS ${GUI_ROOT_DIR})
     MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
   ENDIF(EXISTS ${GUI_ROOT_DIR})

diff --git a/src/HEXABLOCKGUI/CMakeLists.txt b/src/HEXABLOCKGUI/CMakeLists.txt
index d628ff2332a60a18243945c9c9500aa8933d218e..3dd8de2a293363c28144c39d9d9a97e3fd07954f 100644 (file)
--- a/src/HEXABLOCKGUI/CMakeLists.txt
+++ b/src/HEXABLOCKGUI/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 ADD_SUBDIRECTORY(MyDlgRef)
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -91,7 +91,7 @@ SET(HEXABLOCK_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -170,7 +170,7 @@ SET(_pyuic_files
 )
 
 # scripts / pyuic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_pyuic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_pyuic_files})
 
 # sources / to compile
 SET(HEXABLOCK_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
@@ -246,11 +246,12 @@ SET(_other_RESOURCES
 
 ADD_LIBRARY(HEXABLOCK ${HEXABLOCK_SOURCES})
 TARGET_LINK_LIBRARIES(HEXABLOCK ${_link_LIBRARIES} )
+SET_TARGET_PROPERTIES(HEXABLOCK PROPERTIES COMPILE_DEFINITIONS QT_DISABLE_DEPRECATED_BEFORE=0 )
 INSTALL(TARGETS HEXABLOCK EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${HEXABLOCK_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HEXABLOCK_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HEXABLOCK_INSTALL_RES_DATA}")
 
 INSTALL(FILES ${_other_RESOURCES}
         DESTINATION ${SALOME_HEXABLOCK_INSTALL_RES_DATA})

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
index c39b045344453ad065f601479c0541130f30eb2a..af1f8cb031c7cef94310c7a236bd3452781e938b 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
@@ -42,7 +42,7 @@ QStandardItem()
        {
                setText(m_DocElt->getName());
                if ( m_DocElt->isAssociated() )
-                  setData(QColor(Qt::darkGreen), Qt::ForegroundRole);
+                   setData(QColor(Qt::darkGreen), Qt::ForegroundRole);
        }
        setData( treeRole,    HEXA_TREE_ROLE );
        setData( entry,       HEXA_DOC_ENTRY_ROLE);

diff --git a/src/HEXABLOCKGUI/MyDlgRef/CMakeLists.txt b/src/HEXABLOCKGUI/MyDlgRef/CMakeLists.txt
index c3bc127bcfb716a625a914b5923befe21911391c..bcdd54770ae42830234a713173d7663eb8dcde3b 100644 (file)
--- a/src/HEXABLOCKGUI/MyDlgRef/CMakeLists.txt
+++ b/src/HEXABLOCKGUI/MyDlgRef/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -41,7 +43,7 @@ SET(MyDlgRef_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${MyDlgRef_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${MyDlgRef_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -60,7 +62,7 @@ SET(_pyuic_files
 )
 
 # scripts / pyuic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_pyuic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_pyuic_files})
 
 # sources / to compile
 SET(MyDlgRef_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})

diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
index 97f775be94e8bca0f8064fe34722e3978c3d1ebe..e0d4ba81285caf25706cd39dc3020a6a7f2f63da 100644 (file)
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -22,7 +22,7 @@
 #ifndef KLINKITEMSELECTIONMODEL_H
 #define KLINKITEMSELECTIONMODEL_H
 
-#include "HEXABLOCKGUI_Export.hxx"\r
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QObject>
 #include <QItemSelectionModel>

diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
index 750d1fcbe31096544bc4645cb89fc65db9cb3cdc..09e5429fe9d7c6a298364355049fde667e2ca4fa 100644 (file)
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
@@ -307,4 +307,4 @@ QItemSelection KModelIndexProxyMapper::mapSelectionRightToLeft(const QItemSelect
 }
 
 // #include "kmodelindexproxymapper_moc.cxx"
-// #include "kmodelindexproxymapper.moc"
\ No newline at end of file
+// #include "kmodelindexproxymapper.moc"