diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2015-11-26 11:48:36 +0200 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2015-12-07 10:44:16 +0000 |
| commit | 8db16a42eac274076f9f7cab2b4c49c9fcb56af1 (patch) | |
| tree | dbc571cebb5ea782720fb0c0bf3a9e1be4fef963 /src/virtualkeyboard/styles | |
| parent | 97d9648f5d950ea7d7b64f5c2db67359e8f47013 (diff) | |
[1/2] Fix static build
This change modifies the files that exist in the 1.3 version.
Fix static build of the virtual keyboard:
- Included instructions for the static build in the build doc.
- Added missing resource initialization macros to the plugin.cpp.
- Register QML module dependencies conditionally in the virtual
keyboard plugin initialization.
- Added missing attributes to the styles plugin qmldir file.
- Renamed StylesPlugin class to QtVirtualKeyboardStylesPlugin.
Change-Id: Idc1d35fbd95bd19932baaab13849a4a65d4e944f
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard/styles')
| -rw-r--r-- | src/virtualkeyboard/styles/qmldir | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/styles/styles_plugin.cpp | 4 | ||||
| -rw-r--r-- | src/virtualkeyboard/styles/styles_plugin.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/virtualkeyboard/styles/qmldir b/src/virtualkeyboard/styles/qmldir index 1893c556..b3c810d5 100644 --- a/src/virtualkeyboard/styles/qmldir +++ b/src/virtualkeyboard/styles/qmldir @@ -1,2 +1,4 @@ module QtQuick.Enterprise.VirtualKeyboard.Styles plugin qtvirtualkeyboardstylesplugin +classname QtVirtualKeyboardStylesPlugin +typeinfo plugins.qmltypes diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index 7178dd5e..495eebd2 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -31,7 +31,7 @@ This module provides styling components for the Qt Virtual Keyboard. */ -void StylesPlugin::registerTypes(const char *uri) +void QtVirtualKeyboardStylesPlugin::registerTypes(const char *uri) { Q_INIT_RESOURCE(styles); const QString path(QStringLiteral("qrc:///QtQuick/Enterprise/VirtualKeyboard/Styles/content/")); @@ -50,7 +50,7 @@ void StylesPlugin::registerTypes(const char *uri) qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 2, 0, "TraceCanvas"); } -void StylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri) +void QtVirtualKeyboardStylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(uri) engine->addImageProvider(QStringLiteral("qtvkbsvg"), new SvgImageProvider()); diff --git a/src/virtualkeyboard/styles/styles_plugin.h b/src/virtualkeyboard/styles/styles_plugin.h index e7f7d75b..becf7e92 100644 --- a/src/virtualkeyboard/styles/styles_plugin.h +++ b/src/virtualkeyboard/styles/styles_plugin.h @@ -24,7 +24,7 @@ #include <QQmlExtensionPlugin> -class StylesPlugin : public QQmlExtensionPlugin +class QtVirtualKeyboardStylesPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") |