diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-03-31 09:51:32 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-04-04 17:23:40 +0000 |
| commit | 8342c36a8a216481ddacc6aee514077586b08573 (patch) | |
| tree | 5a69fac0a152998f305581ab9ae9c1476ef6b0e4 /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | dd0f312f04475da6a6d5f72a6af255c94181a6f2 (diff) | |
Bundle pinyin dictionary in the plugin
This change modifies the pinyin library and adds support for loading
the dictionary from the qt resource system.
[ChangeLog] The pinyin dictionary is now bundled in the plugin by default.
Task-number: QTBUG-66198
Change-Id: I17459c4bde89cc4ccd96ad5c97393a5ad502b902
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index b8d0a8dc..ece00047 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -15,6 +15,7 @@ win32 { !no-pkg-config: CONFIG += link_pkgconfig include(../config.pri) +include(generateresource.pri) SOURCES += platforminputcontext.cpp \ inputcontext.cpp \ @@ -338,10 +339,15 @@ pinyin { pinyindecoderservice.h DEFINES += HAVE_PINYIN QMAKE_USE += pinyin - pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat - pinyin_data.path = $$DATAPATH/pinyin - INSTALLS += pinyin_data - !prefix_build: COPIES += pinyin_data + !no-bundle-pinyin { + PINYIN_FILES += 3rdparty/pinyin/data/dict_pinyin.dat + RESOURCES += $$generate_resource(pinyin.qrc, $$PINYIN_FILES, /QtQuick/VirtualKeyboard) + } else { + pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat + pinyin_data.path = $$DATAPATH/pinyin + INSTALLS += pinyin_data + !prefix_build: COPIES += pinyin_data + } } tcime { @@ -459,8 +465,6 @@ record-trace-input { arrow-key-navigation: DEFINES += QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION -include(generateresource.pri) - !disable-layouts { RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/VirtualKeyboard) DEFINES += HAVE_LAYOUTS |