From 53695ba6ac58455117d1d335b0c743e91a58594f Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Sat, 31 Mar 2018 20:15:36 +0300 Subject: Bundle tcime dictionary in the plugin This change bundles the tcime dictionaries into plugin by default. [ChangeLog] The tcime dictionary is now bundled in the plugin by default. Task-number: QTBUG-66198 Change-Id: I0a8ed09e9a32f0ec3fa08efbdb5802d83e727463 Reviewed-by: Andy Shaw Reviewed-by: Mitch Curtis --- src/virtualkeyboard/virtualkeyboard.pro | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'src/virtualkeyboard/virtualkeyboard.pro') diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index ece00047..3b4a2b96 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -359,15 +359,24 @@ tcime { cangjie: DEFINES += HAVE_TCIME_CANGJIE zhuyin: DEFINES += HAVE_TCIME_ZHUYIN QMAKE_USE += tcime - tcime_data.files = \ - $$PWD/3rdparty/tcime/data/qt/dict_phrases.dat - cangjie: tcime_data.files += \ - $$PWD/3rdparty/tcime/data/qt/dict_cangjie.dat - zhuyin: tcime_data.files += \ - $$PWD/3rdparty/tcime/data/qt/dict_zhuyin.dat - tcime_data.path = $$DATAPATH/tcime - INSTALLS += tcime_data - !prefix_build: COPIES += tcime_data + !no-bundle-tcime { + TCIME_FILES += 3rdparty/tcime/data/qt/dict_phrases.dat + cangjie: TCIME_FILES += \ + 3rdparty/tcime/data/qt/dict_cangjie.dat + zhuyin: TCIME_FILES += \ + 3rdparty/tcime/data/qt/dict_zhuyin.dat + RESOURCES += $$generate_resource(tcime.qrc, $$TCIME_FILES, /QtQuick/VirtualKeyboard) + } else { + tcime_data.files = \ + $$PWD/3rdparty/tcime/data/qt/dict_phrases.dat + cangjie: tcime_data.files += \ + $$PWD/3rdparty/tcime/data/qt/dict_cangjie.dat + zhuyin: tcime_data.files += \ + $$PWD/3rdparty/tcime/data/qt/dict_zhuyin.dat + tcime_data.path = $$DATAPATH/tcime + INSTALLS += tcime_data + !prefix_build: COPIES += tcime_data + } } hangul { -- cgit v1.2.3