From: imn Date: Thu, 26 Nov 2015 14:44:56 +0000 (+0300) Subject: Merge Qt5 porting. X-Git-Tag: V8_0_0a1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f0c0b67e3e78c7a60ff379ff029cb10809a755e;p=plugins%2Fhexoticplugin.git Merge Qt5 porting. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index eda7e97..13df60e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,8 +109,12 @@ ENDIF(SALOME_BUILD_GUI) ## IF(SALOME_BUILD_GUI) - # 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() ENDIF(SALOME_BUILD_GUI) # OCCT diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index e7dae2d..36b40c4 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -19,7 +19,7 @@ ADD_SUBDIRECTORY(resources) -INCLUDE(UseQt4Ext) +INCLUDE(UseQtExt) # --- options --- # additional include directories @@ -78,7 +78,7 @@ SET(HexoticPluginGUI_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 @@ -107,7 +107,7 @@ SET(_uic_files ) # header files / uic wrappings -QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) +QT_WRAP_UIC(_uic_HEADERS ${_uic_files}) # sources / to compile SET(HexoticPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS}) @@ -120,4 +120,4 @@ INSTALL(TARGETS HexoticPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION $ INSTALL(FILES ${HexoticPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}")