aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Strobl <stroblju@gmail.com>2017-05-03 18:38:25 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-05 04:49:16 +0000
commit0b29698c74b053bbe47404fe01ed5c3c6ce79acf (patch)
treef0e507d4d695bfdf571e5c20594799c9955ec7a3
parent9db37be7210d4071c8b2c7bfa98d1822075ab452 (diff)
Fix bundling of module for static builds
Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: I2856ceaf8148ccbe2c930ec5fdd878c084107ea3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
-rw-r--r--src/virtualkeyboard/styles/styles_plugin.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/virtualkeyboard/styles/styles_plugin.h b/src/virtualkeyboard/styles/styles_plugin.h
index f401fdb9..9673a23a 100644
--- a/src/virtualkeyboard/styles/styles_plugin.h
+++ b/src/virtualkeyboard/styles/styles_plugin.h
@@ -32,12 +32,20 @@
#include <QQmlExtensionPlugin>
+static void initResources()
+{
+#ifdef QT_STATIC
+ Q_INIT_RESOURCE(qmake_QtQuick_VirtualKeyboard_Styles);
+#endif
+}
+
class QtVirtualKeyboardStylesPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
+ QtVirtualKeyboardStylesPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri);
};