aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugin/plugin.cpp4
-rw-r--r--src/plugins/hangul/hangul.pro8
-rw-r--r--src/plugins/lipi-toolkit/plugin/plugin.pro8
-rw-r--r--src/plugins/myscript/plugin/plugin.pro8
-rw-r--r--src/plugins/openwnn/plugin/plugin.pro8
-rw-r--r--src/plugins/pinyin/plugin/plugin.pro8
-rw-r--r--src/plugins/t9write/plugin/plugin.pro8
-rw-r--r--src/plugins/tcime/plugin/plugin.pro8
-rw-r--r--src/plugins/thai/plugin/plugin.pro8
-rw-r--r--src/virtualkeyboard/content/styles/default/virtualkeyboard_default_style.qrc (renamed from src/virtualkeyboard/content/styles/default/default_style.qrc)0
-rw-r--r--src/virtualkeyboard/content/styles/retro/virtualkeyboard_retro_style.qrc (renamed from src/virtualkeyboard/content/styles/retro/retro_style.qrc)0
-rw-r--r--src/virtualkeyboard/content/virtualkeyboard_content.qrc (renamed from src/virtualkeyboard/content/content.qrc)0
-rw-r--r--src/virtualkeyboard/virtualkeyboard.pro12
13 files changed, 42 insertions, 38 deletions
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index ed9b5d9d..fb54ce65 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -55,6 +55,10 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con
Q_UNUSED(paramList);
#if defined(QT_STATICPLUGIN)
+ Q_INIT_RESOURCE(qmake_virtualkeyboard_layouts);
+ Q_INIT_RESOURCE(virtualkeyboard_content);
+ Q_INIT_RESOURCE(virtualkeyboard_default_style);
+ Q_INIT_RESOURCE(virtualkeyboard_retro_style);
Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardPlugin)
Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardSettingsPlugin)
Q_VKB_IMPORT_PLUGIN(QtQuickVirtualKeyboardStylesPlugin)
diff --git a/src/plugins/hangul/hangul.pro b/src/plugins/hangul/hangul.pro
index 7c7532d0..5106ce34 100644
--- a/src/plugins/hangul/hangul.pro
+++ b/src/plugins/hangul/hangul.pro
@@ -24,10 +24,10 @@ LAYOUT_FILES += \
OTHER_FILES += \
$$LAYOUT_FILES
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_hangul_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_hangul_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_hangul_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_hangul_layouts
win32 {
QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Hangul (Qt $$QT_VERSION)"
diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro
index 3379da6c..427d2aa8 100644
--- a/src/plugins/lipi-toolkit/plugin/plugin.pro
+++ b/src/plugins/lipi-toolkit/plugin/plugin.pro
@@ -46,10 +46,10 @@ OTHER_FILES += \
$$LAYOUT_FILES
!isEmpty(LAYOUT_FILES) {
- layouts.files = $$LAYOUT_FILES
- layouts.base = $$LAYOUTS_BASE
- layouts.prefix = $$LAYOUTS_PREFIX
- RESOURCES += layouts
+ virtualkeyboard_ltk_layouts.files = $$LAYOUT_FILES
+ virtualkeyboard_ltk_layouts.base = $$LAYOUTS_BASE
+ virtualkeyboard_ltk_layouts.prefix = $$LAYOUTS_PREFIX
+ RESOURCES += virtualkeyboard_ltk_layouts
}
win32 {
diff --git a/src/plugins/myscript/plugin/plugin.pro b/src/plugins/myscript/plugin/plugin.pro
index 04143e09..b8357991 100644
--- a/src/plugins/myscript/plugin/plugin.pro
+++ b/src/plugins/myscript/plugin/plugin.pro
@@ -93,10 +93,10 @@ contains(CONFIG, lang-zh(_TW)?): LAYOUT_FILES += $$LAYOUTS_BASE/content/layouts/
OTHER_FILES += \
$$LAYOUT_FILES
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_myscript_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_myscript_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_myscript_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_myscript_layouts
win32 {
QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard MyScript (Qt $$QT_VERSION)"
diff --git a/src/plugins/openwnn/plugin/plugin.pro b/src/plugins/openwnn/plugin/plugin.pro
index 1fde08a2..76234f89 100644
--- a/src/plugins/openwnn/plugin/plugin.pro
+++ b/src/plugins/openwnn/plugin/plugin.pro
@@ -22,10 +22,10 @@ LAYOUT_FILES += \
OTHER_FILES += \
$$LAYOUT_FILES
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_openwnn_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_openwnn_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_openwnn_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_openwnn_layouts
QMAKE_USE += openwnn
diff --git a/src/plugins/pinyin/plugin/plugin.pro b/src/plugins/pinyin/plugin/plugin.pro
index 40d41a07..980862b4 100644
--- a/src/plugins/pinyin/plugin/plugin.pro
+++ b/src/plugins/pinyin/plugin/plugin.pro
@@ -24,10 +24,10 @@ LAYOUT_FILES += \
OTHER_FILES += \
$$LAYOUT_FILES
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_pinyin_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_pinyin_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_pinyin_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_pinyin_layouts
QMAKE_USE += pinyin
!no-bundle-pinyin {
diff --git a/src/plugins/t9write/plugin/plugin.pro b/src/plugins/t9write/plugin/plugin.pro
index 37b9d740..1c6393cf 100644
--- a/src/plugins/t9write/plugin/plugin.pro
+++ b/src/plugins/t9write/plugin/plugin.pro
@@ -71,10 +71,10 @@ t9write-cjk {
OTHER_FILES += \
$$LAYOUT_FILES
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_t9write_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_t9write_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_t9write_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_t9write_layouts
DEFINES += HAVE_T9WRITE
QMAKE_USE += t9write_db
diff --git a/src/plugins/tcime/plugin/plugin.pro b/src/plugins/tcime/plugin/plugin.pro
index 8a34f916..b50b8402 100644
--- a/src/plugins/tcime/plugin/plugin.pro
+++ b/src/plugins/tcime/plugin/plugin.pro
@@ -19,10 +19,10 @@ LAYOUT_FILES += \
$$LAYOUTS_BASE/content/layouts/zh_TW/numbers.fallback \
$$LAYOUTS_BASE/content/layouts/zh_TW/symbols.qml
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_tcime_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_tcime_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_tcime_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_tcime_layouts
cangjie: DEFINES += HAVE_TCIME_CANGJIE
zhuyin: DEFINES += HAVE_TCIME_ZHUYIN
diff --git a/src/plugins/thai/plugin/plugin.pro b/src/plugins/thai/plugin/plugin.pro
index 82826d76..65d61709 100644
--- a/src/plugins/thai/plugin/plugin.pro
+++ b/src/plugins/thai/plugin/plugin.pro
@@ -26,10 +26,10 @@ LAYOUT_FILES += \
OTHER_FILES += \
$$LAYOUT_FILES
-layouts.files = $$LAYOUT_FILES
-layouts.base = $$LAYOUTS_BASE
-layouts.prefix = $$LAYOUTS_PREFIX
-RESOURCES += layouts
+virtualkeyboard_thai_layouts.files = $$LAYOUT_FILES
+virtualkeyboard_thai_layouts.base = $$LAYOUTS_BASE
+virtualkeyboard_thai_layouts.prefix = $$LAYOUTS_PREFIX
+RESOURCES += virtualkeyboard_thai_layouts
win32 {
QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard Thai (Qt $$QT_VERSION)"
diff --git a/src/virtualkeyboard/content/styles/default/default_style.qrc b/src/virtualkeyboard/content/styles/default/virtualkeyboard_default_style.qrc
index 277e8cde..277e8cde 100644
--- a/src/virtualkeyboard/content/styles/default/default_style.qrc
+++ b/src/virtualkeyboard/content/styles/default/virtualkeyboard_default_style.qrc
diff --git a/src/virtualkeyboard/content/styles/retro/retro_style.qrc b/src/virtualkeyboard/content/styles/retro/virtualkeyboard_retro_style.qrc
index 881755ef..881755ef 100644
--- a/src/virtualkeyboard/content/styles/retro/retro_style.qrc
+++ b/src/virtualkeyboard/content/styles/retro/virtualkeyboard_retro_style.qrc
diff --git a/src/virtualkeyboard/content/content.qrc b/src/virtualkeyboard/content/virtualkeyboard_content.qrc
index 1e6392f4..1e6392f4 100644
--- a/src/virtualkeyboard/content/content.qrc
+++ b/src/virtualkeyboard/content/virtualkeyboard_content.qrc
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
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 07:50:28 +0000