diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 11:14:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 11:14:18 +0200 |
| commit | 17548a0b1965074fff5b3036f77ea8261a132c92 (patch) | |
| tree | 25f1ec36d43d0e7ab4f3110929a2c3b39329a13e /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | f58add00ffa5dd5b3fd7bc31bf3cacc452cb8e5c (diff) | |
| parent | e99680e6577a52fb07096eb45095125bb90cf980 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/virtualkeyboard/lipisharedrecognizer.cpp
src/virtualkeyboard/styles/styles.pro
src/virtualkeyboard/virtualkeyboard.pro
Change-Id: I150f2ad265f8a7bd07be1d9415cdad854e200e87
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index b5d03b7b..85436c03 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -222,6 +222,7 @@ qtquickcompiler: DEFINES += COMPILING_QML hunspell_data.files = 3rdparty/hunspell/data/*.dic 3rdparty/hunspell/data/*.aff hunspell_data.path = $$DATAPATH/hunspell INSTALLS += hunspell_data + !prefix_build: COPIES += hunspell_data } else { error("Hunspell dictionaries are missing! Please copy .dic and .aff" \ "files to src/virtualkeyboard/3rdparty/hunspell/data directory.") @@ -249,6 +250,7 @@ pinyin { pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat pinyin_data.path = $$DATAPATH/pinyin INSTALLS += pinyin_data + !prefix_build: COPIES += pinyin_data } tcime { @@ -269,6 +271,7 @@ tcime { $$PWD/3rdparty/tcime/data/qt/dict_zhuyin.dat tcime_data.path = $$DATAPATH/tcime INSTALLS += tcime_data + !prefix_build: COPIES += tcime_data } hangul { |