aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-11-20 13:49:39 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-11-20 13:49:39 +0100
commit5fe00843cf15c60870cd22b8cd039b6f249cf396 (patch)
tree371401ad52595540c766475a83b23f044096d00e
parent58d698111b211851b7f4093ba901ddaf7cbbd039 (diff)
parent2dabbf20b81fa0c85dbcd4f31f7c45819caca2d2 (diff)
Merge 5.10 into 5.10.0
-rw-r--r--src/virtualkeyboard/3rdparty/pinyin/pinyin.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro
index 485ee5dc..9ad9a318 100644
--- a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro
+++ b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro
@@ -55,5 +55,5 @@ win32 {
CONFIG += qt
QT = core
} else {
- LIBS += -pthread
+ CONFIG *= thread
}