diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-09-03 23:00:33 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-09-06 09:46:28 +0000 |
| commit | a046dd2d5486e4805481fd360e486f869d0fa36d (patch) | |
| tree | 135c40769ef740a241dffbdabb3f390ac27b0466 /src/plugins/myscript | |
| parent | e827477d83f61ad2e8e93a2cce2196a3017c6429 (diff) | |
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>
Diffstat (limited to 'src/plugins/myscript')
| -rw-r--r-- | src/plugins/myscript/plugin/plugin.pro | 8 |
1 files changed, 4 insertions, 4 deletions
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)" |