From: imn <imn@opencascade.com>
Date: Thu, 26 Nov 2015 14:49:29 +0000 (+0300)
Subject: Merge Qt5 porting.
X-Git-Tag: V8_0_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?p=samples%2Fpyhello.git;a=commitdiff_plain;h=fb8796ae39f96cebaa64b0c3e4a4543554ef7abb

Merge Qt5 porting.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98dcd72..98aabaa 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,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()
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
diff --git a/src/PYHELLOGUI/CMakeLists.txt b/src/PYHELLOGUI/CMakeLists.txt
index 9eac4ee..05079a2 100755
--- a/src/PYHELLOGUI/CMakeLists.txt
+++ b/src/PYHELLOGUI/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_PYHELLO_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")
\ No newline at end of file