From 6bc45aca6c48596028eeeb73bf93232750c772d7 Mon Sep 17 00:00:00 2001 From: imn Date: Thu, 26 Nov 2015 17:43:17 +0300 Subject: [PATCH] Merge Qt5 porting. --- CMakeLists.txt | 9 ++++++--- src/gui/CMakeLists.txt | 6 +++--- src/tepal2med/CMakeLists.txt | 6 +++--- src/tepal2med/ghs3dprl_mesh_wrap.h | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c545fd3..4ee9e34 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,9 +109,12 @@ ENDIF(SALOME_BUILD_GUI) ## From GUI ## IF(SALOME_BUILD_GUI) - # Qt4 - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) - INCLUDE(${QT_USE_FILE}) + # Qt + IF(NOT SALOME_GUI_BUILD_WITH_QT5) + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) + ELSE() + FIND_PACKAGE(SalomeQt5 REQUIRED) + ENDIF() ENDIF(SALOME_BUILD_GUI) # VTK diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2f37355..be7056b 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/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 @@ -69,7 +69,7 @@ SET(GHS3DPRLPluginGUI_HEADERS # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${GHS3DPRLPluginGUI_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${GHS3DPRLPluginGUI_HEADERS}) # sources / static SET(_other_SOURCES @@ -98,4 +98,4 @@ INSTALL(TARGETS GHS3DPRLPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION INSTALL(FILES ${GHS3DPRLPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPRLPLUGIN_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPRLPLUGIN_INSTALL_RES_DATA}") diff --git a/src/tepal2med/CMakeLists.txt b/src/tepal2med/CMakeLists.txt index a6dc987..60714f3 100644 --- a/src/tepal2med/CMakeLists.txt +++ b/src/tepal2med/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 @@ -59,7 +59,7 @@ SET(tepal2med_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 @@ -74,7 +74,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(tepal2med_SOURCES tepal2med.cxx ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS}) diff --git a/src/tepal2med/ghs3dprl_mesh_wrap.h b/src/tepal2med/ghs3dprl_mesh_wrap.h index 2348ec0..925a724 100755 --- a/src/tepal2med/ghs3dprl_mesh_wrap.h +++ b/src/tepal2med/ghs3dprl_mesh_wrap.h @@ -158,9 +158,9 @@ public: bool ReadFilePOINTS(const QString FileName); bool Find_VerticesDomainToVerticesSkin(); bool Write_masterxmlMEDfile(); - bool Write_MEDfiles_v0(bool deletekeys=FALSE); - bool Write_MEDfiles_v1(bool deletekeys=FALSE); - bool Write_MEDfiles_v2(bool deletekeys=FALSE); + bool Write_MEDfiles_v0(bool deletekeys=false); + bool Write_MEDfiles_v1(bool deletekeys=false); + bool Write_MEDfiles_v2(bool deletekeys=false); }; #endif -- 2.30.2