Merge Qt5 porting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bcae7f168475da9ca9300f806e72a36d6dd3884..094d155d12f825073241c2c20835a1ec313e9f5b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,9 +82,12 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 ## From GUI:
 ##
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-INCLUDE(${QT_USE_FILE})
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 
 # Directories
 # (default values taken from KERNEL)

diff --git a/src/PYLIGHTGUI/CMakeLists.txt b/src/PYLIGHTGUI/CMakeLists.txt
index 5602be58d03b72767a9bb081dbf24d9b78b6268f..9e3c7e32d144fddfb585b881759bb3af067d2682 100755 (executable)
--- a/src/PYLIGHTGUI/CMakeLists.txt
+++ b/src/PYLIGHTGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -44,4 +44,4 @@ SET(_ts_RESOURCES
 # --- rules ---
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYLIGHT_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYLIGHT_INSTALL_RES_DATA}")
\ No newline at end of file