diff options
| author | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-12-02 13:05:03 +0200 |
|---|---|---|
| committer | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-12-16 11:49:17 +0200 |
| commit | aa9223a4d7d410aa8a12495fef5c3f36a2c79ffe (patch) | |
| tree | b35a38a32991d120e5b3b6ebe1d14bef326bd34e /src/imports | |
| parent | 1ace321e373ad19287c41cef9ae17fcfb7ab938d (diff) | |
Build device utilities with CMake and qmake against Qt 6
Also fix compiler warnings.
Task-number: QTBUG-88317
Change-Id: Iff6014613a7d12426b6fe692dff0000c92930ace
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/imports/networksettings/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/imports/networksettings/networksettings.pro | 2 | ||||
| -rw-r--r-- | src/imports/networksettings/plugin.h | 2 |
4 files changed, 31 insertions, 2 deletions
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt new file mode 100644 index 0000000..9ecd47d --- /dev/null +++ b/src/imports/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from imports.pro. + +if(TARGET networksettings) + add_subdirectory(networksettings) +endif() diff --git a/src/imports/networksettings/CMakeLists.txt b/src/imports/networksettings/CMakeLists.txt new file mode 100644 index 0000000..0c43a30 --- /dev/null +++ b/src/imports/networksettings/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from networksettings.pro. + +##################################################################### +## networksettingsplugin Plugin: +##################################################################### + +qt_add_qml_module(networksettingsplugin + URI "QtDeviceUtilities.NetworkSettings" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME NetworkSettingsQmlPlugin + SKIP_TYPE_REGISTRATION + SOURCES + plugin.cpp plugin.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick + networksettings +) + +#### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>: +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtDeviceUtilities/NetworkSettings" diff --git a/src/imports/networksettings/networksettings.pro b/src/imports/networksettings/networksettings.pro index 7c1dc0a..c630fb2 100644 --- a/src/imports/networksettings/networksettings.pro +++ b/src/imports/networksettings/networksettings.pro @@ -1,6 +1,6 @@ QT += qml quick networksettings - CONFIG += no_cxx_module +QML_IMPORT_VERSION = $$QT_VERSION TARGET = networksettingsplugin TARGETPATH = QtDeviceUtilities/NetworkSettings diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h index 0cae114..6125127 100644 --- a/src/imports/networksettings/plugin.h +++ b/src/imports/networksettings/plugin.h @@ -39,7 +39,7 @@ class NetworkSettingsQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void registerTypes(const char *uri); + void registerTypes(const char *uri) override; }; QT_END_NAMESPACE |