diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:59:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:59:12 +0100 |
| commit | 85251f9293c0b41178b9c1c8b7c00726a41017a8 (patch) | |
| tree | 9167479a97e55f5bd0367abca1d9082b3c03995b /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | 0371486a32a0e39cdc9d04f9d1245b214d269e3c (diff) | |
| parent | 5fe45f3bf60961519b89950e4a91aa14251499fd (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
src/virtualkeyboard/shifthandler.cpp
Change-Id: I1f95238b9ac5deed3bec6d85f7433cafe219f7ea
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 6866f4ff..7faba317 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -323,6 +323,10 @@ lipi-toolkit { win32: LIBS += Advapi32.lib else: LIBS += -ldl record-trace-input: DEFINES += QT_VIRTUALKEYBOARD_LIPI_RECORD_TRACE_INPUT + ltk_projects.files = $$PWD/3rdparty/lipi-toolkit/projects + ltk_projects.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit + INSTALLS += ltk_projects + !prefix_build: COPIES += ltk_projects } t9write { |