diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-31 15:13:03 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-05-06 15:59:55 +0200 |
| commit | a50db98b23526737a4f7680d4e02ccd455309699 (patch) | |
| tree | 825205ae7763f534f963ea0bf1ad843b6d616cda | |
| parent | 70105b9b43fecff7cb0ce7a0c84b314e10e8143c (diff) | |
Fix static build when using disable-layouts and no-builtin-style
When building the keyboard statically with CONFIG+=disable-layouts and
CONFIG+=no-builtin-style, there would be linker errors due to
Q_INIT_RESOURCE being defined unconditionally. Put these lines behind
Change-Id: Id181cf078237abb54893675c9efaf06b4860678d
Fixes: QTBUG-83187
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | src/plugin/plugin.cpp | 4 | ||||
| -rw-r--r-- | src/plugin/plugin.pro | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index bf58bc2f..122a671d 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -55,10 +55,14 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con Q_UNUSED(paramList); #if defined(QT_STATICPLUGIN) +#if !defined(QT_VIRTUALKEYBOARD_DISABLE_LAYOUTS) Q_INIT_RESOURCE(qmake_virtualkeyboard_layouts); +#endif Q_INIT_RESOURCE(virtualkeyboard_content); +#if !defined(QT_VIRTUALKEYBOARD_NO_BUILTIN_STYLES) Q_INIT_RESOURCE(virtualkeyboard_default_style); Q_INIT_RESOURCE(virtualkeyboard_retro_style); +#endif Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardPlugin) Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardSettingsPlugin) Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardStylesPlugin) diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro index 8cf53c9a..defb3747 100644 --- a/src/plugin/plugin.pro +++ b/src/plugin/plugin.pro @@ -18,6 +18,13 @@ DEFINES += \ QT_NO_CAST_FROM_ASCII \ QT_NO_CAST_FROM_BYTEARRAY +no-builtin-style { + DEFINES += QT_VIRTUALKEYBOARD_NO_BUILTIN_STYLES +} +disable-layouts { + DEFINES += QT_VIRTUALKEYBOARD_DISABLE_LAYOUTS +} + win32 { QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt." |