From a50db98b23526737a4f7680d4e02ccd455309699 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 31 Mar 2020 15:13:03 +0200 Subject: 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 Reviewed-by: Andy Shaw --- src/plugin/plugin.cpp | 4 ++++ src/plugin/plugin.pro | 7 +++++++ 2 files changed, 11 insertions(+) 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." -- cgit v1.2.3