Qt5 update.

[tools/yacsgen.git] / module_generator / gui_tmpl.py

diff --git a/module_generator/gui_tmpl.py b/module_generator/gui_tmpl.py
index 4fef5c42af2d7957df94ae137d366be7ad0f3516..5b5237c348576058945339073dac3fe8b498cfda 100644 (file)
--- a/module_generator/gui_tmpl.py
+++ b/module_generator/gui_tmpl.py
@@ -82,7 +82,7 @@ cppsalomeapp=Template(cppsalomeapp)
 #   resources : resource files
 #   ts_resources : .ts files - to be processed by lrelease
 cmake_cpp_gui = """
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -125,13 +125,12 @@ SET(_moc_HEADERS
 )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS $${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS $${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES $${_moc_HEADERS})
-
+QT_WRAP_MOC(_moc_SOURCES $${_moc_HEADERS})  
 
 # sources / static
 SET(_other_SOURCES
@@ -165,7 +164,7 @@ INSTALL(TARGETS ${module} EXPORT $${PROJECT_NAME}TargetGroup DESTINATION $${SALO
 
 INSTALL(FILES $${_moc_HEADERS} DESTINATION $${SALOME_INSTALL_HEADERS})
 INSTALL(FILES $${_res_files} DESTINATION "$${SALOME_${module}_INSTALL_RES_DATA}")
-QT4_INSTALL_TS_RESOURCES("$${_ts_files}" "$${SALOME_${module}_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("$${_ts_files}" "$${SALOME_${module}_INSTALL_RES_DATA}")
 """
 cmake_cpp_gui = Template(cmake_cpp_gui)
 
@@ -176,7 +175,7 @@ cmake_cpp_gui = Template(cmake_cpp_gui)
 #   ts_resources : .ts files - to be processed by lrelease
 #   resources : other resource files
 cmake_py_gui = """
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -206,6 +205,6 @@ SET(_res_files
 
 SALOME_INSTALL_SCRIPTS("$${_bin_SCRIPTS}" $${SALOME_INSTALL_SCRIPT_PYTHON})
 INSTALL(FILES $${_res_files} DESTINATION "$${SALOME_${module}_INSTALL_RES_DATA}")
-QT4_INSTALL_TS_RESOURCES("$${_ts_RESOURCES}" "$${SALOME_${module}_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("$${_ts_RESOURCES}" "$${SALOME_${module}_INSTALL_RES_DATA}")
 """
 cmake_py_gui = Template(cmake_py_gui)