diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-11-01 10:46:34 +0200 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-11-04 16:08:40 +0200 |
| commit | ed5a9b888b2273f207ac4840c026636c9ffd9945 (patch) | |
| tree | f375ce927e71c8a75a143bda64f05f60f656b3d3 /src | |
| parent | 4508d027f0c3d08f681542e50264a776d10efe4c (diff) | |
Fix exported QML types
Currently exposed QML API is incorrect. Also move
folder to prevent issues with pch generation with
syncqt
Task-number: QTBUG-97737
Change-Id: Iac58a2ba90f87302fc52a608ce7dea9acaedbdb6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/networksettingsqml/CMakeLists.txt (renamed from src/networksettings/networksettingsqml/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | src/networksettingsqml/qnetworksettingsforeign.cpp (renamed from src/networksettings/networksettingsqml/qnetworksettingsforeign.cpp) | 0 | ||||
| -rw-r--r-- | src/networksettingsqml/qnetworksettingsforeign.h (renamed from src/networksettings/networksettingsqml/qnetworksettingsforeign.h) | 26 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25640ce..9467fcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(networksettings) -add_subdirectory(networksettings/networksettingsqml) +add_subdirectory(networksettingsqml) add_subdirectory(settingsui/settingsuiplugin) add_subdirectory(settingsui/qtbuttonimageproviderplugin) add_subdirectory(settingsui) diff --git a/src/networksettings/networksettingsqml/CMakeLists.txt b/src/networksettingsqml/CMakeLists.txt index db3f58c..db3f58c 100644 --- a/src/networksettings/networksettingsqml/CMakeLists.txt +++ b/src/networksettingsqml/CMakeLists.txt diff --git a/src/networksettings/networksettingsqml/qnetworksettingsforeign.cpp b/src/networksettingsqml/qnetworksettingsforeign.cpp index e3d1414..e3d1414 100644 --- a/src/networksettings/networksettingsqml/qnetworksettingsforeign.cpp +++ b/src/networksettingsqml/qnetworksettingsforeign.cpp diff --git a/src/networksettings/networksettingsqml/qnetworksettingsforeign.h b/src/networksettingsqml/qnetworksettingsforeign.h index b979397..ff9ec57 100644 --- a/src/networksettings/networksettingsqml/qnetworksettingsforeign.h +++ b/src/networksettingsqml/qnetworksettingsforeign.h @@ -30,17 +30,7 @@ #define NETWORKSETTINGSPLUGIN_PLUGIN_H #include <QtQml/qqml.h> -#include <QtNetworkSettings/qnetworksettings.h> -#include <QtNetworkSettings/qnetworksettingsmanager.h> -#include <QtNetworkSettings/qnetworksettingsservice.h> -#include <QtNetworkSettings/qnetworksettingsuseragent.h> -#include <QtNetworkSettings/qnetworksettingsservicemodel.h> -#include <QtNetworkSettings/qnetworksettingsinterface.h> -#include <QtNetworkSettings/qnetworksettingsinterfacemodel.h> - -Q_DECLARE_METATYPE(QNetworkSettingsUserAgent) -Q_DECLARE_METATYPE(QNetworkSettingsServiceFilter) -Q_DECLARE_METATYPE(QNetworkSettingsInterfaceModel) +#include <QtNetworkSettings/QtNetworkSettings> QT_BEGIN_NAMESPACE @@ -48,7 +38,7 @@ struct NetworkSettingsServiceForeign { Q_GADGET QML_FOREIGN(QNetworkSettingsService) - QML_NAMED_ELEMENT(NetworkSettingsService) + QML_NAMED_ELEMENT(NetworkService) QML_UNCREATABLE("Cannot be instantiated directly.") QML_ADDED_IN_VERSION(1, 0) }; @@ -57,7 +47,7 @@ struct NetworkSettingsInterfaceForeign { Q_GADGET QML_FOREIGN(QNetworkSettingsInterface) - QML_NAMED_ELEMENT(NetworkSettingsInterface) + QML_NAMED_ELEMENT(NetworkInterface) QML_UNCREATABLE("Cannot be instantiated directly.") QML_ADDED_IN_VERSION(1, 0) }; @@ -89,6 +79,15 @@ struct NetworkSettingsProxyForeign QML_ADDED_IN_VERSION(1, 0) }; +struct NetworkSettingsWirelessForeign +{ + Q_GADGET + QML_FOREIGN(QNetworkSettingsWireless) + QML_NAMED_ELEMENT(NetworkSettingsWireless) + QML_UNCREATABLE("Cannot be instantiated directly.") + QML_ADDED_IN_VERSION(1, 0) +}; + struct NetworkSettingsTypeForeign { Q_GADGET @@ -110,6 +109,7 @@ struct NetworkSettingsStateForeign class QNetworkSettingsManagerForeign { Q_GADGET + QML_FOREIGN(QNetworkSettingsManager) QML_NAMED_ELEMENT(NetworkSettingsManager) QML_SINGLETON QML_ADDED_IN_VERSION(2, 0) |