diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2021-06-11 08:22:15 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-06-14 14:39:20 +0300 |
commit | fcf3bae3c19623df2f90d53434342b917a6d01bc (patch) | |
tree | 8a125e0a9dee5e39d3bb2a7c18de923dcdd2b0a7 | |
parent | 2ce745192cf637e7418f52457c1cd32198167b66 (diff) |
CMake: Update to latest Qt CMake API
Task-number: QTBUG-91621
Fixes: QTBUG-94396
Change-Id: Ieaf5241eeb297a86775bb784c39217eb2b92b1b9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | src/imports/networksettings/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/networksettings/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/settingsui/CMakeLists.txt | 44 | ||||
-rw-r--r-- | src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt | 19 | ||||
-rw-r--r-- | src/settingsui/settingsuiplugin/CMakeLists.txt | 20 |
5 files changed, 27 insertions, 74 deletions
diff --git a/src/imports/networksettings/CMakeLists.txt b/src/imports/networksettings/CMakeLists.txt index b2b07b8..60f8a64 100644 --- a/src/imports/networksettings/CMakeLists.txt +++ b/src/imports/networksettings/CMakeLists.txt @@ -1,14 +1,16 @@ -# Generated from networksettings.pro. - ##################################################################### ## networksettingsplugin Plugin: ##################################################################### -qt_add_qml_module(networksettingsplugin +qt_internal_add_qml_module(networksettingsplugin URI "QtDeviceUtilities.NetworkSettings" VERSION "${CMAKE_PROJECT_VERSION}" - CLASSNAME NetworkSettingsQmlPlugin - SKIP_TYPE_REGISTRATION + CLASS_NAME NetworkSettingsQmlPlugin + PLUGIN_TARGET networksettingsplugin + NO_GENERATE_PLUGIN_SOURCE + NO_PLUGIN_OPTIONAL + NO_GENERATE_QMLTYPES + INSTALL_SOURCE_QMLTYPES "plugins.qmltypes" SOURCES plugin.cpp plugin.h PUBLIC_LIBRARIES @@ -18,7 +20,3 @@ qt_add_qml_module(networksettingsplugin Qt::Quick Qt::NetworkSettings ) - -#### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>: -# QML_IMPORT_VERSION = "$$QT_VERSION" -# TARGETPATH = "QtDeviceUtilities/NetworkSettings" diff --git a/src/networksettings/CMakeLists.txt b/src/networksettings/CMakeLists.txt index ba8872b..083b43f 100644 --- a/src/networksettings/CMakeLists.txt +++ b/src/networksettings/CMakeLists.txt @@ -4,7 +4,7 @@ ## NetworkSettings Module: ##################################################################### -qt_add_module(NetworkSettings +qt_internal_add_module(NetworkSettings SOURCES connman/connmancommon.cpp connman/connmancommon.h connman/qnetworksettingsinterface_p.cpp connman/qnetworksettingsinterface_p.h diff --git a/src/settingsui/CMakeLists.txt b/src/settingsui/CMakeLists.txt index e7801db..5bec7ee 100644 --- a/src/settingsui/CMakeLists.txt +++ b/src/settingsui/CMakeLists.txt @@ -1,10 +1,8 @@ -# Generated from settingsui.pro. - ##################################################################### ## settingsui Binary: ##################################################################### -qt_add_executable(settingsui +qt_internal_add_executable(settingsui GUI SOURCES main.cpp @@ -39,50 +37,14 @@ set(settingsuiapp_resource_files "settingsuiplugin/pluginMain.qml" ) -qt_add_resource(settingsui "settingsuiapp" +qt_internal_add_resource(settingsui "settingsuiapp" PREFIX "/" FILES ${settingsuiapp_resource_files} ) - -#### Keys ignored in scope 1:.:.:settingsui.pro:<TRUE>: -# QML_IMPORT_PATH = <EMPTY> -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -qt_extend_target(settingsui CONDITION static +qt_internal_extend_target(settingsui CONDITION static PUBLIC_LIBRARIES Qt::Svg ) - -#### Keys ignored in scope 2:.:.:settingsui.pro:static: -# QTPLUGIN = "qtvirtualkeyboardplugin" - -#### Keys ignored in scope 4:.:.:deployment.pri:android-no-sdk: -# INSTALLS = "target" -# target.path = "/data/user/qt" - -#### Keys ignored in scope 6:.:.:deployment.pri:ANDROID: -# INSTALLS = "target" - -#### Keys ignored in scope 7:.:.:deployment.pri:TEST_architecture_arch STREQUAL i386: -# target.path = "/libs/x86" - -#### Keys ignored in scope 9:.:.:deployment.pri:TEST_architecture_arch STREQUAL arm: -# target.path = "/libs/armeabi-v7a" - -#### Keys ignored in scope 10:.:.:deployment.pri:else: -# target.path = "/libs/armeabi" - -#### Keys ignored in scope 12:.:.:deployment.pri:UNIX: -# INSTALLS = "target" - -#### Keys ignored in scope 14:.:.:deployment.pri:QNX: -# target.path = "/tmp/$${TARGET}/bin" - -#### Keys ignored in scope 15:.:.:deployment.pri:else: -# target.path = "$$[QT_INSTALL_BINS]" diff --git a/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt b/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt index abe52e9..b8c0f0c 100644 --- a/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt +++ b/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt @@ -1,14 +1,16 @@ -# Generated from qtbuttonimageproviderplugin.pro. - ##################################################################### ## qtbuttonimageproviderplugin Plugin: ##################################################################### -qt_add_qml_module(qtbuttonimageproviderplugin +qt_internal_add_qml_module(qtbuttonimageproviderplugin URI "QtDeviceUtilities.QtButtonImageProvider" VERSION "${CMAKE_PROJECT_VERSION}" - CLASSNAME QtButtonImageProviderQmlPlugin - SKIP_TYPE_REGISTRATION + CLASS_NAME QtButtonImageProviderQmlPlugin + PLUGIN_TARGET qtbuttonimageproviderplugin + NO_GENERATE_PLUGIN_SOURCE + NO_PLUGIN_OPTIONAL + NO_GENERATE_QMLTYPES + INSTALL_SOURCE_QMLTYPES "plugins.qmltypes" SOURCES plugin.cpp qtbuttonimageprovider.cpp qtbuttonimageprovider.h @@ -24,14 +26,9 @@ set(qtbuttonimageprovider_resource_files "QtButton.qml" ) -qt_add_resource(qtbuttonimageproviderplugin "qtbuttonimageprovider" +qt_internal_add_resource(qtbuttonimageproviderplugin "qtbuttonimageprovider" PREFIX "/" FILES ${qtbuttonimageprovider_resource_files} ) - - -#### Keys ignored in scope 1:.:.:qtbuttonimageproviderplugin.pro:<TRUE>: -# QML_IMPORT_VERSION = "$$QT_VERSION" -# TARGETPATH = "QtDeviceUtilities/QtButtonImageProvider" diff --git a/src/settingsui/settingsuiplugin/CMakeLists.txt b/src/settingsui/settingsuiplugin/CMakeLists.txt index ec62693..0f72bc0 100644 --- a/src/settingsui/settingsuiplugin/CMakeLists.txt +++ b/src/settingsui/settingsuiplugin/CMakeLists.txt @@ -1,14 +1,16 @@ -# Generated from settingsuiplugin.pro. - ##################################################################### ## settingsuiplugin Plugin: ##################################################################### -qt_add_qml_module(settingsuiplugin +qt_internal_add_qml_module(settingsuiplugin URI "QtDeviceUtilities.SettingsUI" VERSION "${CMAKE_PROJECT_VERSION}" - CLASSNAME SettingsUIQmlPlugin - SKIP_TYPE_REGISTRATION + CLASS_NAME SettingsUIQmlPlugin + PLUGIN_TARGET settingsuiplugin + NO_GENERATE_PLUGIN_SOURCE + NO_PLUGIN_OPTIONAL + NO_GENERATE_QMLTYPES + INSTALL_SOURCE_QMLTYPES "plugins.qmltypes" SOURCES plugin.cpp PUBLIC_LIBRARIES @@ -49,15 +51,9 @@ set(settingsui_resource_files "pluginMain.qml" ) -qt_add_resource(settingsuiplugin "settingsui" +qt_internal_add_resource(settingsuiplugin "settingsui" PREFIX "/" FILES ${settingsui_resource_files} ) - - -#### Keys ignored in scope 1:.:.:settingsuiplugin.pro:<TRUE>: -# DISTFILES = "qmldir" -# QML_IMPORT_VERSION = "$$QT_VERSION" -# TARGETPATH = "QtDeviceUtilities/SettingsUI" |