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/localdevice | |
| 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/localdevice')
| -rw-r--r-- | src/imports/localdevice/plugin.cpp | 6 | ||||
| -rw-r--r-- | src/imports/localdevice/qmldir | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp index 785b364..506c6f6 100644 --- a/src/imports/localdevice/plugin.cpp +++ b/src/imports/localdevice/plugin.cpp @@ -96,16 +96,12 @@ static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine) return api; } -class B2QtUtilsPlugin : public QQmlExtensionPlugin +class LocalDeviceSettingsQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - B2QtUtilsPlugin() - { - } - void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == "QtDeviceUtilities.LocalDeviceSettings"); diff --git a/src/imports/localdevice/qmldir b/src/imports/localdevice/qmldir index 1d9791b..81b12d4 100644 --- a/src/imports/localdevice/qmldir +++ b/src/imports/localdevice/qmldir @@ -1,3 +1,4 @@ module QtDeviceUtilities.LocalDeviceSettings plugin localdeviceplugin +classname LocalDeviceSettingsQmlPlugin typeinfo plugins.qmltypes |