aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-18 12:48:13 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-18 12:48:13 +0100
commit5fe45f3bf60961519b89950e4a91aa14251499fd (patch)
tree9955a8cc6692b1358391700ab96570db2e84bf0d
parenteb3383fab42ee1e741d54e044bfb7246640a57a5 (diff)
parentc2a58836ba4a9671520da132ee2891245a56405f (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
-rw-r--r--src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri
index df20b654..a1b770bb 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri
@@ -4,6 +4,9 @@ CONFIG -= qt
CONFIG += exceptions
CONFIG += warn_off
+contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
+contains(QT_CONFIG, build_all): CONFIG += build_all
+
INCLUDEPATH += $$PWD/include
load(qt_build_paths)