diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-15 09:43:49 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-16 12:40:19 +0000 |
| commit | 1d4be220e00064d89cd87d196d91708e6ac388ae (patch) | |
| tree | 2c3be8b195045bf2629cf1a7a9bae9c6c08e83b4 /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | 3fe30fc98d8cb3424cebd924133064a36ef548e0 (diff) | |
Clean up resource handling
Since Qt 5.6 it is possible to pass "objects" to RESOURCES that describe
files and prefix directly. That allows getting rid of the qmake code to
generate .qrc files here, resources.prf does that by itself now.
Change-Id: Ibdcfd47355aeb10b83d23f6b00ec55b179b03bbf
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 0fd9c933..4990c44c 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -16,7 +16,6 @@ win32 { !no-pkg-config: CONFIG += link_pkgconfig include(../config.pri) -include(generateresource.pri) SOURCES += platforminputcontext.cpp \ inputcontext.cpp \ @@ -353,7 +352,9 @@ pinyin { QMAKE_USE += pinyin !no-bundle-pinyin { PINYIN_FILES += 3rdparty/pinyin/data/dict_pinyin.dat - RESOURCES += $$generate_resource(pinyin.qrc, $$PINYIN_FILES, /QtQuick/VirtualKeyboard) + pinyin.files = $$PINYIN_FILES + pinyin.prefix = /QtQuick/VirtualKeyboard + RESOURCES += pinyin } else { pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat pinyin_data.path = $$DATAPATH/pinyin @@ -377,7 +378,9 @@ tcime { 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) + tcime.files = $$TCIME_FILES + tcime.prefix = /QtQuick/VirtualKeyboard + RESOURCES += tcime } else { tcime_data.files = \ $$PWD/3rdparty/tcime/data/qt/dict_phrases.dat @@ -487,7 +490,9 @@ record-trace-input { arrow-key-navigation: DEFINES += QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION !disable-layouts { - RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/VirtualKeyboard) + layouts.files = $$LAYOUT_FILES + layouts.prefix = /QtQuick/VirtualKeyboard + RESOURCES += layouts DEFINES += HAVE_LAYOUTS } |