From: imn <imn@opencascade.com>
Date: Thu, 26 Nov 2015 14:50:24 +0000 (+0300)
Subject: Migrate to Qt 5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b3fea7b066e17cbf7920ce903125cf8c227568fe;p=samples%2Fsierpinsky.git

Migrate to Qt 5
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d726c1..a15ae1f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,8 +99,12 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 
 # 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()
 # OCCT
 FIND_PACKAGE(SalomeCAS REQUIRED)
 # VTK
diff --git a/src/SierpinskyGUI/CMakeLists.txt b/src/SierpinskyGUI/CMakeLists.txt
index 732ce77..3059e89 100644
--- a/src/SierpinskyGUI/CMakeLists.txt
+++ b/src/SierpinskyGUI/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
@@ -71,7 +71,7 @@ SET (SIERPINSKY_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -98,4 +98,4 @@ TARGET_LINK_LIBRARIES(SIERPINSKY ${_link_LIBRARIES} )
 INSTALL(TARGETS SIERPINSKY EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${SIERPINSKY_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SIERPINSKY_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SIERPINSKY_INSTALL_RES_DATA}")