Skip to content

Commit 83ad380

Browse files
nyalldawsonnyalldawson
committed
Switch QT4_* macros to QT5
1 parent fdaa632 commit 83ad380

File tree

57 files changed

+119
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+119
-124
lines changed

‎src/analysis/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
8787
)
8888
ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
8989

90-
QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
90+
QT5_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
9191

9292
# install headers
9393

‎src/analysis/network/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SET(QGIS_NETWORK_ANALYSIS_MOC_HDRS
1818
qgslinevectorlayerdirector.h
1919
)
2020

21-
QT4_WRAP_CPP(QGIS_NETWORK_ANALYSIS_MOC_SRCS ${QGIS_NETWORK_ANALYSIS_MOC_HDRS})
21+
QT5_WRAP_CPP(QGIS_NETWORK_ANALYSIS_MOC_SRCS ${QGIS_NETWORK_ANALYSIS_MOC_HDRS})
2222

2323
# install headers
2424

‎src/app/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,13 @@ ENDIF (POSTGRES_FOUND)
465465

466466
SET(IMAGE_RCCS ../../images/images.qrc)
467467

468-
QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
468+
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
469469

470470
# add test resources, e.g. standard test font
471471
SET(TEST_RCCS ../../tests/testdata/testdata.qrc)
472-
QT4_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS})
472+
QT5_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS})
473473

474-
QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
474+
QT5_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
475475

476476
SET (QGIS_APPMAIN_SRCS main.cpp)
477477

‎src/auth/basic/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
2929
${CMAKE_CURRENT_BINARY_DIR}
3030
)
3131

32-
QT4_WRAP_UI (AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
32+
QT5_WRAP_UI (AUTH_BASIC_UIS_H ${AUTH_BASIC_UIS})
3333

34-
QT4_WRAP_CPP(AUTH_BASIC_MOC_SRCS ${AUTH_BASIC_MOC_HDRS})
34+
QT5_WRAP_CPP(AUTH_BASIC_MOC_SRCS ${AUTH_BASIC_MOC_HDRS})
3535

3636
ADD_LIBRARY (basicauthmethod MODULE ${AUTH_BASIC_SRCS} ${AUTH_BASIC_HDRS} ${AUTH_BASIC_MOC_SRCS} ${AUTH_BASIC_UIS_H})
3737

‎src/auth/identcert/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
2929
${CMAKE_CURRENT_BINARY_DIR}
3030
)
3131

32-
QT4_WRAP_UI (AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
32+
QT5_WRAP_UI (AUTH_IDENTCERT_UIS_H ${AUTH_IDENTCERT_UIS})
3333

34-
QT4_WRAP_CPP(AUTH_IDENTCERT_MOC_SRCS ${AUTH_IDENTCERT_MOC_HDRS})
34+
QT5_WRAP_CPP(AUTH_IDENTCERT_MOC_SRCS ${AUTH_IDENTCERT_MOC_HDRS})
3535

3636
ADD_LIBRARY (identcertauthmethod MODULE ${AUTH_IDENTCERT_SRCS} ${AUTH_IDENTCERT_HDRS} ${AUTH_IDENTCERT_MOC_SRCS} ${AUTH_IDENTCERT_UIS_H})
3737

‎src/auth/pkipaths/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
2929
${CMAKE_CURRENT_BINARY_DIR}
3030
)
3131

32-
QT4_WRAP_UI (AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
32+
QT5_WRAP_UI (AUTH_PKIPATHS_UIS_H ${AUTH_PKIPATHS_UIS})
3333

34-
QT4_WRAP_CPP(AUTH_PKIPATHS_MOC_SRCS ${AUTH_PKIPATHS_MOC_HDRS})
34+
QT5_WRAP_CPP(AUTH_PKIPATHS_MOC_SRCS ${AUTH_PKIPATHS_MOC_HDRS})
3535

3636
ADD_LIBRARY (pkipathsauthmethod MODULE ${AUTH_PKIPATHS_SRCS} ${AUTH_PKIPATHS_HDRS} ${AUTH_PKIPATHS_MOC_SRCS} ${AUTH_PKIPATHS_UIS_H})
3737

‎src/auth/pkipkcs12/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ INCLUDE_DIRECTORIES (
2929
${CMAKE_CURRENT_BINARY_DIR}
3030
)
3131

32-
QT4_WRAP_UI (AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
32+
QT5_WRAP_UI (AUTH_PKCS12_UIS_H ${AUTH_PKCS12_UIS})
3333

34-
QT4_WRAP_CPP(AUTH_PKCS12_MOC_SRCS ${AUTH_PKCS12_MOC_HDRS})
34+
QT5_WRAP_CPP(AUTH_PKCS12_MOC_SRCS ${AUTH_PKCS12_MOC_HDRS})
3535

3636
ADD_LIBRARY (pkcs12authmethod MODULE ${AUTH_PKCS12_SRCS} ${AUTH_PKCS12_HDRS} ${AUTH_PKCS12_MOC_SRCS} ${AUTH_PKCS12_UIS_H})
3737

‎src/browser/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ SET(IMAGE_RCCS ../../images/images.qrc)
4545
########################################################
4646
# Build
4747

48-
QT4_WRAP_UI (BROWSER_UIS_H ${BROWSER_UIS})
48+
QT5_WRAP_UI (BROWSER_UIS_H ${BROWSER_UIS})
4949

50-
QT4_WRAP_CPP (BROWSER_MOC_SRCS ${BROWSER_MOC_HDRS})
50+
QT5_WRAP_CPP (BROWSER_MOC_SRCS ${BROWSER_MOC_HDRS})
5151

52-
QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
53-
#QT4_ADD_RESOURCES(BROWSER_RCC_SRCS ${BROWSER_RCCS})
52+
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
53+
#QT5_ADD_RESOURCES(BROWSER_RCC_SRCS ${BROWSER_RCCS})
5454

5555
ADD_EXECUTABLE (qbrowser MACOSX_BUNDLE WIN32 ${BROWSER_SRCS} ${BROWSER_MOC_SRCS} ${BROWSER_UIS_H} ${IMAGE_RCC_SRCS})
5656

‎src/core/CMakeLists.txt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -388,17 +388,12 @@ IF(ENABLE_MODELTEST)
388388
../../tests/qt_modeltest/modeltest.h
389389
../../tests/qt_modeltest/dynamictreemodel.h
390390
)
391-
QT4_WRAP_CPP(MODELTEST_MOC_SRCS ${MODELTEST_MOC_HDRS})
391+
QT5_WRAP_CPP(MODELTEST_MOC_SRCS ${MODELTEST_MOC_HDRS})
392392
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
393393
${MODELTEST_SRCS} ${MODELTEST_MOC_SRCS}
394394
)
395395
ENDIF(ENABLE_MODELTEST)
396396

397-
# TODO - update for Qt5
398-
#SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
399-
# qgshttptransaction.cpp
400-
#)
401-
402397
IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
403398
# spatialindex headers produce warnings
404399
SET_SOURCE_FILES_PROPERTIES(qgsspatialindex.cpp PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual)
@@ -577,7 +572,7 @@ IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
577572
)
578573
ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
579574

580-
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
575+
QT5_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
581576

582577
IF(MSVC)
583578
SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "/wd4512 /wd4996" )

‎src/customwidgets/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ INCLUDE_DIRECTORIES(SYSTEM
114114
${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4
115115
)
116116

117-
QT4_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
117+
QT5_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
118118

119119
#############################################################
120120
# qgis_customwidgets library
121121

122122
SET(IMAGE_RCCS ../../images/images.qrc)
123-
QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
123+
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
124124

125125
ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_HDRS} ${IMAGE_RCC_SRCS})
126126

0 commit comments

Comments
 (0)