Switch QT4_* macros to QT5

src/analysis/CMakeLists.txt

@@ -87,7 +87,7 @@ IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   )
 ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
-QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
+QT5_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
 
 # install headers
 

src/analysis/network/CMakeLists.txt

@@ -18,7 +18,7 @@ SET(QGIS_NETWORK_ANALYSIS_MOC_HDRS
   qgslinevectorlayerdirector.h
 )
 
-QT4_WRAP_CPP(QGIS_NETWORK_ANALYSIS_MOC_SRCS ${QGIS_NETWORK_ANALYSIS_MOC_HDRS})
+QT5_WRAP_CPP(QGIS_NETWORK_ANALYSIS_MOC_SRCS ${QGIS_NETWORK_ANALYSIS_MOC_HDRS})
 
 # install headers
 

src/app/CMakeLists.txt

@@ -465,13 +465,13 @@ ENDIF (POSTGRES_FOUND)
 
 SET(IMAGE_RCCS ../../images/images.qrc)
 
-QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
+QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
 
 # add test resources, e.g. standard test font
 SET(TEST_RCCS ../../tests/testdata/testdata.qrc)
-QT4_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS})
+QT5_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS})
 
-QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
+QT5_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
 
 SET (QGIS_APPMAIN_SRCS main.cpp)
 

src/auth/basic/CMakeLists.txt

@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-QT4_WRAP_UI (AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
+QT5_WRAP_UI (AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
 
-QT4_WRAP_CPP(AUTH_BASIC_MOC_SRCS ${AUTH_BASIC_MOC_HDRS})
+QT5_WRAP_CPP(AUTH_BASIC_MOC_SRCS ${AUTH_BASIC_MOC_HDRS})
 
 ADD_LIBRARY (basicauthmethod MODULE ${AUTH_BASIC_SRCS} ${AUTH_BASIC_HDRS} ${AUTH_BASIC_MOC_SRCS} ${AUTH_BASIC_UIS_H})
 

src/auth/identcert/CMakeLists.txt

@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-QT4_WRAP_UI (AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
+QT5_WRAP_UI (AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
 
-QT4_WRAP_CPP(AUTH_IDENTCERT_MOC_SRCS ${AUTH_IDENTCERT_MOC_HDRS})
+QT5_WRAP_CPP(AUTH_IDENTCERT_MOC_SRCS ${AUTH_IDENTCERT_MOC_HDRS})
 
 ADD_LIBRARY (identcertauthmethod MODULE ${AUTH_IDENTCERT_SRCS} ${AUTH_IDENTCERT_HDRS} ${AUTH_IDENTCERT_MOC_SRCS} ${AUTH_IDENTCERT_UIS_H})
 

src/auth/pkipaths/CMakeLists.txt

@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-QT4_WRAP_UI (AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
+QT5_WRAP_UI (AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
 
-QT4_WRAP_CPP(AUTH_PKIPATHS_MOC_SRCS ${AUTH_PKIPATHS_MOC_HDRS})
+QT5_WRAP_CPP(AUTH_PKIPATHS_MOC_SRCS ${AUTH_PKIPATHS_MOC_HDRS})
 
 ADD_LIBRARY (pkipathsauthmethod MODULE ${AUTH_PKIPATHS_SRCS} ${AUTH_PKIPATHS_HDRS} ${AUTH_PKIPATHS_MOC_SRCS} ${AUTH_PKIPATHS_UIS_H})
 

src/auth/pkipkcs12/CMakeLists.txt

@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-QT4_WRAP_UI (AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
+QT5_WRAP_UI (AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
 
-QT4_WRAP_CPP(AUTH_PKCS12_MOC_SRCS ${AUTH_PKCS12_MOC_HDRS})
+QT5_WRAP_CPP(AUTH_PKCS12_MOC_SRCS ${AUTH_PKCS12_MOC_HDRS})
 
 ADD_LIBRARY (pkcs12authmethod MODULE ${AUTH_PKCS12_SRCS} ${AUTH_PKCS12_HDRS} ${AUTH_PKCS12_MOC_SRCS} ${AUTH_PKCS12_UIS_H})
 

src/browser/CMakeLists.txt

@@ -45,12 +45,12 @@ SET(IMAGE_RCCS ../../images/images.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (BROWSER_UIS_H  ${BROWSER_UIS})
+QT5_WRAP_UI (BROWSER_UIS_H  ${BROWSER_UIS})
 
-QT4_WRAP_CPP (BROWSER_MOC_SRCS  ${BROWSER_MOC_HDRS})
+QT5_WRAP_CPP (BROWSER_MOC_SRCS  ${BROWSER_MOC_HDRS})
 
-QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
-#QT4_ADD_RESOURCES(BROWSER_RCC_SRCS ${BROWSER_RCCS})
+QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
+#QT5_ADD_RESOURCES(BROWSER_RCC_SRCS ${BROWSER_RCCS})
 
 ADD_EXECUTABLE (qbrowser MACOSX_BUNDLE WIN32 ${BROWSER_SRCS} ${BROWSER_MOC_SRCS} ${BROWSER_UIS_H} ${IMAGE_RCC_SRCS})
 

src/core/CMakeLists.txt

@@ -388,17 +388,12 @@ IF(ENABLE_MODELTEST)
     ../../tests/qt_modeltest/modeltest.h
     ../../tests/qt_modeltest/dynamictreemodel.h
   )
-  QT4_WRAP_CPP(MODELTEST_MOC_SRCS ${MODELTEST_MOC_HDRS})
+  QT5_WRAP_CPP(MODELTEST_MOC_SRCS ${MODELTEST_MOC_HDRS})
   SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
     ${MODELTEST_SRCS} ${MODELTEST_MOC_SRCS}
   )
 ENDIF(ENABLE_MODELTEST)
 
-# TODO - update for Qt5
-#SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
-#    qgshttptransaction.cpp
-#)
-
 IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # spatialindex headers produce warnings
   SET_SOURCE_FILES_PROPERTIES(qgsspatialindex.cpp PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual)
@@ -577,7 +572,7 @@ IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
   )
 ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
 
-QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
+QT5_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
 
 IF(MSVC)
   SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "/wd4512 /wd4996" )

src/customwidgets/CMakeLists.txt

@@ -114,13 +114,13 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4
 )
 
-QT4_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
+QT5_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
 
 #############################################################
 # qgis_customwidgets library
 
 SET(IMAGE_RCCS ../../images/images.qrc)
-QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
+QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
 
 ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_HDRS} ${IMAGE_RCC_SRCS})
 

src/gui/CMakeLists.txt

@@ -616,7 +616,7 @@ IF (WITH_QTWEBKIT)
   )
 ENDIF (WITH_QTWEBKIT)
 
-QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
+QT5_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
 
 IF(MSVC)
   SET_SOURCE_FILES_PROPERTIES(${QGIS_GUI_MOC_SRCS} PROPERTIES COMPILE_FLAGS "/wd4512 /wd4996" )

src/helpviewer/CMakeLists.txt

@@ -44,11 +44,11 @@ ENDIF (WIN32)
 ########################################################
 # Build
 
-QT4_WRAP_UI (HELP_UIS_H  ${HELP_UIS})
+QT5_WRAP_UI (HELP_UIS_H  ${HELP_UIS})
 
-QT4_WRAP_CPP (HELP_MOC_SRCS  ${HELP_MOC_HDRS})
+QT5_WRAP_CPP (HELP_MOC_SRCS  ${HELP_MOC_HDRS})
 
-QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
+QT5_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
 
 ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H} ${HELP_RCC_SRCS})
 

src/plugins/compass/CMakeLists.txt

@@ -21,11 +21,11 @@ SET (COMPASS_RCCS  compass.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (COMPASS_UIS_H  ${COMPASS_UIS})
+QT5_WRAP_UI (COMPASS_UIS_H  ${COMPASS_UIS})
 
-QT4_WRAP_CPP (COMPASS_MOC_SRCS  ${COMPASS_MOC_HDRS})
+QT5_WRAP_CPP (COMPASS_MOC_SRCS  ${COMPASS_MOC_HDRS})
 
-QT4_ADD_RESOURCES(COMPASS_RCC_SRCS ${COMPASS_RCCS})
+QT5_ADD_RESOURCES(COMPASS_RCC_SRCS ${COMPASS_RCCS})
 
 ADD_LIBRARY (compassplugin MODULE ${COMPASS_SRCS} ${COMPASS_MOC_SRCS} ${COMPASS_RCC_SRCS} ${COMPASS_UIS_H})
 

src/plugins/coordinate_capture/CMakeLists.txt

@@ -19,11 +19,11 @@ SET (coordinatecapture_RCCS  coordinatecapture.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (coordinatecapture_UIS_H  ${coordinatecapture_UIS})
+QT5_WRAP_UI (coordinatecapture_UIS_H  ${coordinatecapture_UIS})
 
-QT4_WRAP_CPP (coordinatecapture_MOC_SRCS  ${coordinatecapture_MOC_HDRS})
+QT5_WRAP_CPP (coordinatecapture_MOC_SRCS  ${coordinatecapture_MOC_HDRS})
 
-QT4_ADD_RESOURCES(coordinatecapture_RCC_SRCS ${coordinatecapture_RCCS})
+QT5_ADD_RESOURCES(coordinatecapture_RCC_SRCS ${coordinatecapture_RCCS})
 
 ADD_LIBRARY (coordinatecaptureplugin MODULE ${coordinatecapture_SRCS} ${coordinatecapture_MOC_SRCS} ${coordinatecapture_RCC_SRCS})
 

src/plugins/dxf2shp_converter/CMakeLists.txt

@@ -22,11 +22,11 @@ SET (dxf2shpconverter_RCCS  dxf2shpconverter.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (dxf2shpconverter_UIS_H  ${dxf2shpconverter_UIS})
+QT5_WRAP_UI (dxf2shpconverter_UIS_H  ${dxf2shpconverter_UIS})
 
-QT4_WRAP_CPP (dxf2shpconverter_MOC_SRCS  ${dxf2shpconverter_MOC_HDRS})
+QT5_WRAP_CPP (dxf2shpconverter_MOC_SRCS  ${dxf2shpconverter_MOC_HDRS})
 
-QT4_ADD_RESOURCES(dxf2shpconverter_RCC_SRCS ${dxf2shpconverter_RCCS})
+QT5_ADD_RESOURCES(dxf2shpconverter_RCC_SRCS ${dxf2shpconverter_RCCS})
 
 ADD_LIBRARY (dxf2shpconverterplugin MODULE ${dxf2shpconverter_SRCS} ${dxf2shpconverter_MOC_SRCS} ${dxf2shpconverter_RCC_SRCS} ${dxf2shpconverter_UIS_H})
 

src/plugins/evis/CMakeLists.txt

@@ -40,11 +40,11 @@ SET (evis_RCCS resources/evis.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (evis_UIS_H  ${evis_UIS})
+QT5_WRAP_UI (evis_UIS_H  ${evis_UIS})
 
-QT4_WRAP_CPP (evis_MOC_SRCS  ${evis_MOC_HDRS})
+QT5_WRAP_CPP (evis_MOC_SRCS  ${evis_MOC_HDRS})
 
-QT4_ADD_RESOURCES(evis_RCC_SRCS ${evis_RCCS})
+QT5_ADD_RESOURCES(evis_RCC_SRCS ${evis_RCCS})
 
 ADD_LIBRARY (evis MODULE ${evis_SRCS} ${evis_MOC_SRCS} ${evis_RCC_SRCS} ${evis_UIS_H})
 

src/plugins/geometry_checker/CMakeLists.txt

@@ -75,11 +75,11 @@ SET (geometrychecker_RCCS
 ########################################################
 # Build
 
-QT4_WRAP_UI (geometrychecker_UIS_H  ${geometrychecker_UIS})
+QT5_WRAP_UI (geometrychecker_UIS_H  ${geometrychecker_UIS})
 
-QT4_WRAP_CPP (geometrychecker_MOC_SRCS  ${geometrychecker_MOC_HDRS})
+QT5_WRAP_CPP (geometrychecker_MOC_SRCS  ${geometrychecker_MOC_HDRS})
 
-QT4_ADD_RESOURCES(geometrychecker_RCC_SRCS ${geometrychecker_RCCS})
+QT5_ADD_RESOURCES(geometrychecker_RCC_SRCS ${geometrychecker_RCCS})
 
 ADD_LIBRARY (geometrycheckerplugin   MODULE ${geometrychecker_HDRS} ${geometrychecker_SRCS} ${geometrychecker_MOC_SRCS} ${geometrychecker_RCC_SRCS} ${geometrychecker_UIS_H})
 

src/plugins/geometry_snapper/CMakeLists.txt

@@ -31,11 +31,11 @@ SET (geometrysnapper_RCCS
 ########################################################
 # Build
 
-QT4_WRAP_UI (geometrysnapper_UIS_H  ${geometrysnapper_UIS})
+QT5_WRAP_UI (geometrysnapper_UIS_H  ${geometrysnapper_UIS})
 
-QT4_WRAP_CPP (geometrysnapper_MOC_SRCS  ${geometrysnapper_MOC_HDRS})
+QT5_WRAP_CPP (geometrysnapper_MOC_SRCS  ${geometrysnapper_MOC_HDRS})
 
-QT4_ADD_RESOURCES(geometrysnapper_RCC_SRCS ${geometrysnapper_RCCS})
+QT5_ADD_RESOURCES(geometrysnapper_RCC_SRCS ${geometrysnapper_RCCS})
 
 ADD_LIBRARY (geometrysnapperplugin   MODULE ${geometrysnapper_HDRS} ${geometrysnapper_SRCS} ${geometrysnapper_MOC_SRCS} ${geometrysnapper_RCC_SRCS} ${geometrysnapper_UIS_H})
 

src/plugins/georeferencer/CMakeLists.txt

@@ -66,11 +66,11 @@ SET (GEOREF_RCCS  georeferencer.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (GEOREF_UIS_H  ${GEOREF_UIS})
+QT5_WRAP_UI (GEOREF_UIS_H  ${GEOREF_UIS})
 
-QT4_WRAP_CPP (GEOREF_MOC_SRCS  ${GEOREF_MOC_HDRS})
+QT5_WRAP_CPP (GEOREF_MOC_SRCS  ${GEOREF_MOC_HDRS})
 
-QT4_ADD_RESOURCES(GEOREF_RCC_SRCS ${GEOREF_RCCS})
+QT5_ADD_RESOURCES(GEOREF_RCC_SRCS ${GEOREF_RCCS})
 
 ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_SRCS} ${GEOREF_UIS_H})
 

src/plugins/globe/CMakeLists.txt

@@ -48,11 +48,11 @@ ELSE(WIN32)
     ADD_DEFINITIONS("-DGLOBE_EXPORT=")
 ENDIF(WIN32)
 
-QT4_WRAP_UI (GLOBE_PLUGIN_UIS_H  ${GLOBE_PLUGIN_UIS})
+QT5_WRAP_UI (GLOBE_PLUGIN_UIS_H  ${GLOBE_PLUGIN_UIS})
 
-QT4_WRAP_CPP (GLOBE_PLUGIN_MOC_SRCS  ${GLOBE_PLUGIN_MOC_HDRS})
+QT5_WRAP_CPP (GLOBE_PLUGIN_MOC_SRCS  ${GLOBE_PLUGIN_MOC_HDRS})
 
-QT4_ADD_RESOURCES(GLOBE_PLUGIN_RCC_SRCS ${GLOBE_PLUGIN_RCCS})
+QT5_ADD_RESOURCES(GLOBE_PLUGIN_RCC_SRCS ${GLOBE_PLUGIN_RCCS})
 
 ADD_LIBRARY (globeplugin SHARED ${GLOBE_PLUGIN_SRCS} ${GLOBE_PLUGIN_MOC_SRCS} ${GLOBE_PLUGIN_RCC_SRCS} ${GLOBE_PLUGIN_UIS_H} ${GLOBE_PLUGIN_HDRS})
 

src/plugins/globe/featuresource/CMakeLists.txt

@@ -27,7 +27,7 @@ SET(TARGET_HDRS
     qgsglobefeatureutils.h
 )
 
-QT4_WRAP_CPP(TARGET_MOC_SRCS  ${TARGET_MOC_HDRS})
+QT5_WRAP_CPP(TARGET_MOC_SRCS  ${TARGET_MOC_HDRS})
 
 SET(TARGET_SRC ${TARGET_SRC} ${TARGET_MOC_SRCS})
 

src/plugins/gps_importer/CMakeLists.txt

@@ -26,11 +26,11 @@ SET (GPS_RCCS  qgsgps_plugin.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (GPS_UIS_H  ${GPS_UIS})
+QT5_WRAP_UI (GPS_UIS_H  ${GPS_UIS})
 
-QT4_WRAP_CPP (GPS_MOC_SRCS  ${GPS_MOC_HDRS})
+QT5_WRAP_CPP (GPS_MOC_SRCS  ${GPS_MOC_HDRS})
 
-QT4_ADD_RESOURCES(GPS_RCC_SRCS ${GPS_RCCS})
+QT5_ADD_RESOURCES(GPS_RCC_SRCS ${GPS_RCCS})
 
 ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H})
 

src/plugins/grass/CMakeLists.txt

@@ -178,9 +178,9 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
     SET(GRASS_MAJOR_VERSION ${GRASS_MAJOR_VERSION${GRASS_BUILD_VERSION}})
     SET(GRASS_MINOR_VERSION ${GRASS_MINOR_VERSION${GRASS_BUILD_VERSION}})
 
-    QT4_WRAP_UI (GRASS_PLUGIN_UIS_H ${GRASS_PLUGIN_UIS})
-    QT4_WRAP_CPP (GRASS_PLUGIN_MOC_SRCS ${GRASS_PLUGIN_MOC_HDRS})
-    QT4_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
+    QT5_WRAP_UI (GRASS_PLUGIN_UIS_H ${GRASS_PLUGIN_UIS})
+    QT5_WRAP_CPP (GRASS_PLUGIN_MOC_SRCS ${GRASS_PLUGIN_MOC_HDRS})
+    QT5_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
 
     ADD_LIBRARY (grassplugin${GRASS_BUILD_VERSION} MODULE
       ${GRASS_PLUGIN_SRCS}

src/plugins/heatmap/CMakeLists.txt

@@ -19,11 +19,11 @@ SET (heatmap_RCCS  heatmap.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (heatmap_UIS_H  ${heatmap_UIS})
+QT5_WRAP_UI (heatmap_UIS_H  ${heatmap_UIS})
 
-QT4_WRAP_CPP (heatmap_MOC_SRCS  ${heatmap_MOC_HDRS})
+QT5_WRAP_CPP (heatmap_MOC_SRCS  ${heatmap_MOC_HDRS})
 
-QT4_ADD_RESOURCES(heatmap_RCC_SRCS ${heatmap_RCCS})
+QT5_ADD_RESOURCES(heatmap_RCC_SRCS ${heatmap_RCCS})
 
 ADD_LIBRARY (heatmapplugin   MODULE ${heatmap_SRCS} ${heatmap_MOC_SRCS} ${heatmap_RCC_SRCS} ${heatmap_UIS_H})
 

src/plugins/interpolation/CMakeLists.txt

@@ -27,11 +27,11 @@ SET (INTERPOLATION_RCCS  interpolator.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (INTERPOLATION_UIS_H  ${INTERPOLATION_UIS})
+QT5_WRAP_UI (INTERPOLATION_UIS_H  ${INTERPOLATION_UIS})
 
-QT4_WRAP_CPP (INTERPOLATION_MOC_SRCS  ${INTERPOLATION_MOC_HDRS})
+QT5_WRAP_CPP (INTERPOLATION_MOC_SRCS  ${INTERPOLATION_MOC_HDRS})
 
-QT4_ADD_RESOURCES(INTERPOLATION_RCC_SRCS ${INTERPOLATION_RCCS})
+QT5_ADD_RESOURCES(INTERPOLATION_RCC_SRCS ${INTERPOLATION_RCCS})
 
 ADD_LIBRARY (interpolationplugin MODULE
   ${INTERPOLATION_SRCS}

src/plugins/offline_editing/CMakeLists.txt

@@ -24,11 +24,11 @@ SET (offline_editing_plugin_RCCS  offline_editing_plugin.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI(offline_editing_plugin_UIS_H ${offline_editing_plugin_UIS})
+QT5_WRAP_UI(offline_editing_plugin_UIS_H ${offline_editing_plugin_UIS})
 
-QT4_WRAP_CPP(offline_editing_plugin_MOC_SRCS ${offline_editing_plugin_MOC_HDRS})
+QT5_WRAP_CPP(offline_editing_plugin_MOC_SRCS ${offline_editing_plugin_MOC_HDRS})
 
-QT4_ADD_RESOURCES(offline_editing_plugin_RCC_SRCS ${offline_editing_plugin_RCCS})
+QT5_ADD_RESOURCES(offline_editing_plugin_RCC_SRCS ${offline_editing_plugin_RCCS})
 
 ADD_LIBRARY (offlineeditingplugin MODULE
 	${offline_editing_plugin_SRCS}

src/plugins/oracle_raster/CMakeLists.txt

@@ -24,11 +24,11 @@ SET (ORACLE_RCCS  oracleplugin.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (ORACLE_UIS_H  ${ORACLE_UIS})
+QT5_WRAP_UI (ORACLE_UIS_H  ${ORACLE_UIS})
 
-QT4_WRAP_CPP (ORACLE_MOC_SRCS  ${ORACLE_MOC_HDRS})
+QT5_WRAP_CPP (ORACLE_MOC_SRCS  ${ORACLE_MOC_HDRS})
 
-QT4_ADD_RESOURCES(ORACLE_RCC_SRCS ${ORACLE_RCCS})
+QT5_ADD_RESOURCES(ORACLE_RCC_SRCS ${ORACLE_RCCS})
 
 ADD_LIBRARY (oracleplugin MODULE ${ORACLE_SRCS} ${ORACLE_MOC_SRCS} ${ORACLE_RCC_SRCS} ${ORACLE_UIS_H})
 

src/plugins/plugin_template/CMakeLists.txt

@@ -19,11 +19,11 @@ SET ([pluginlcasename]_RCCS  [pluginlcasename].qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI ([pluginlcasename]_UIS_H  ${[pluginlcasename]_UIS})
+QT5_WRAP_UI ([pluginlcasename]_UIS_H  ${[pluginlcasename]_UIS})
 
-QT4_WRAP_CPP ([pluginlcasename]_MOC_SRCS  ${[pluginlcasename]_MOC_HDRS})
+QT5_WRAP_CPP ([pluginlcasename]_MOC_SRCS  ${[pluginlcasename]_MOC_HDRS})
 
-QT4_ADD_RESOURCES([pluginlcasename]_RCC_SRCS ${[pluginlcasename]_RCCS})
+QT5_ADD_RESOURCES([pluginlcasename]_RCC_SRCS ${[pluginlcasename]_RCCS})
 
 ADD_LIBRARY ([pluginlcasename]plugin MODULE ${[pluginlcasename]_SRCS} ${[pluginlcasename]_MOC_SRCS} ${[pluginlcasename]_RCC_SRCS} ${[pluginlcasename]_UIS_H})