Fix resource initialization in static build

Resources used by qtvirtualkeyboard must (still) be initialized manually
in static build. The reason for this is that the resources are located
in the virtualkeyboard module, not in the plugin.

Layouts resources in plugins must have unique name. This change renames the
layouts resource file in each plugin. Otherwise the Q_INIT_RESOURCE does not
work, since all use the same name.

Finally, rename the static resource files to avoid using too generic name and
clash with the user application.

Change-Id: I53054605f14ff8a7b61ce2736f61e456b6c3ee88
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index ea9e6d95..92cdab88 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -67,11 +67,11 @@ HEADERS += \
     qvirtualkeyboard_staticplugin_p.h
 
 !no-builtin-style: RESOURCES += \
-    content/styles/default/default_style.qrc \
-    content/styles/retro/retro_style.qrc
+    content/styles/default/virtualkeyboard_default_style.qrc \
+    content/styles/retro/virtualkeyboard_retro_style.qrc
 
 RESOURCES += \
-    content/content.qrc
+    content/virtualkeyboard_content.qrc
 
 # Fallback for languages which don't have these special layouts
 LAYOUT_FILES += \
@@ -414,9 +414,9 @@ record-trace-input {
 arrow-key-navigation: DEFINES += QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION
 
 !disable-layouts {
-    layouts.files = $$LAYOUT_FILES
-    layouts.prefix = $$LAYOUTS_PREFIX
-    RESOURCES += layouts
+    virtualkeyboard_layouts.files = $$LAYOUT_FILES
+    virtualkeyboard_layouts.prefix = $$LAYOUTS_PREFIX
+    RESOURCES += virtualkeyboard_layouts
     DEFINES += HAVE_LAYOUTS
 }