diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:07:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:07:28 +0200 |
| commit | 732df181cdeffa4f514c78c0d93b1541bf250273 (patch) | |
| tree | 778c46d82bacb2f2fa4ac3f8a1387e3cb603d64e /src | |
| parent | 0e27ca2c843d4e1b29276a8e175ce3360b6aecca (diff) | |
| parent | 19c3a43e8a7d3ea1298099aa733f734a6224ac81 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I98bf52c02f0880233ff0d44d4b8ee410c6797579
Diffstat (limited to 'src')
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 4f3ca694..e601c595 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -250,6 +250,7 @@ qtquickcompiler: DEFINES += COMPILING_QML } pinyin { + LIBS += -pthread SOURCES += \ pinyininputmethod.cpp \ pinyindecoderservice.cpp @@ -324,7 +325,7 @@ lipi-toolkit { -lltkcommon$$qtPlatformTargetSuffix() \ -lltkutil$$qtPlatformTargetSuffix() win32: LIBS += Advapi32.lib - else: LIBS += -ldl + else: QMAKE_USE += libdl 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 |