diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-21 09:51:15 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-26 14:07:38 +0000 |
commit | 234f601126ec72268a1725ae3ab869343addfde7 (patch) | |
tree | df1d9b9ef7fdf9245620e86789b9ea05c7e8e45d /src/imports/networksettings | |
parent | 3ced5d94d2ea89b6951f80e5b4307ac6b0b34dae (diff) |
Fix static build
Fix all issues preventing static build:
- make sure plugins are built statically by removing CONFIG += dll
- add classname to all qmldirs
- unify structure and the naming of all plugin classes
- initialize resources in the plugins
- explicitly include qtvirtualkeyboard plugin in the build
Task-number: QTBUG-68988
Change-Id: I38cdbaae49dd198559be6c9fcd0b8d15a3979e4d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/imports/networksettings')
-rw-r--r-- | src/imports/networksettings/plugin.cpp | 2 | ||||
-rw-r--r-- | src/imports/networksettings/plugin.h | 2 | ||||
-rw-r--r-- | src/imports/networksettings/qmldir | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp index 419b685..ee49594 100644 --- a/src/imports/networksettings/plugin.cpp +++ b/src/imports/networksettings/plugin.cpp @@ -169,7 +169,7 @@ QObject *instance(QQmlEngine *engine, QJSEngine *) { return t; } -void NetworksettingspluginPlugin::registerTypes(const char *uri) +void NetworkSettingsQmlPlugin::registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.NetworkSettings")); qmlRegisterUncreatableType<QNetworkSettingsService>(uri, 1, 0, "NetworkService", "Cannot be instantiated directly."); diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h index e5c7bc7..0cae114 100644 --- a/src/imports/networksettings/plugin.h +++ b/src/imports/networksettings/plugin.h @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE -class NetworksettingspluginPlugin : public QQmlExtensionPlugin +class NetworkSettingsQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") diff --git a/src/imports/networksettings/qmldir b/src/imports/networksettings/qmldir index e94bfe4..64b8d6e 100644 --- a/src/imports/networksettings/qmldir +++ b/src/imports/networksettings/qmldir @@ -1,3 +1,4 @@ module QtDeviceUtilities.NetworkSettings plugin networksettingsplugin +classname NetworkSettingsQmlPlugin typeinfo plugins.qmltypes |