From 5ca9e873e4a0e3bbf5b0e09c6ad9e455ba388be0 Mon Sep 17 00:00:00 2001
From: imn <imn@opencascade.com>
Date: Thu, 26 Nov 2015 17:52:26 +0300
Subject: [PATCH] Merge Qt5 porting.

---
 CMakeLists.txt                | 9 +++++++--
 src/ATOMGENGUI/CMakeLists.txt | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d29b694..58e125c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,9 +86,14 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 ## From GUI:
 ##
-FIND_PACKAGE(SalomeQt4 REQUIRED)
 FIND_PACKAGE(SalomeSIP REQUIRED)
-FIND_PACKAGE(SalomePyQt4 REQUIRED)
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED)
+  FIND_PACKAGE(SalomePyQt4 REQUIRED)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+  FIND_PACKAGE(SalomePyQt5 REQUIRED)
+ENDIF()
 
 # Directories	
 # (default values taken from KERNEL)
diff --git a/src/ATOMGENGUI/CMakeLists.txt b/src/ATOMGENGUI/CMakeLists.txt
index f2b0792..a114e26 100755
--- a/src/ATOMGENGUI/CMakeLists.txt
+++ b/src/ATOMGENGUI/CMakeLists.txt
@@ -17,8 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(UsePyQt4)
+INCLUDE(UseQtExt)
+INCLUDE(UsePyQt)
 
 # --- scripts ---
 
@@ -35,7 +35,7 @@ SET(_pyuic_files
 )
 
 # scripts / pyuic wrappings
-PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
 
 # resource files / to be processed by lrelease
 SET(_ts_RESOURCES
@@ -49,4 +49,4 @@ SET(_all_SCRIPTS ${_bin_SCRIPTS} ${_pyuic_SCRIPTS})
 # --- rules ---
 
 SALOME_INSTALL_SCRIPTS("${_all_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ATOMGEN_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ATOMGEN_INSTALL_RES_DATA}")
\ No newline at end of file
-- 
2.30.2