From cdd7df86c4d9d47fb59c4e3312e9f8d4c7915ea0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 28 Nov 2016 14:52:38 +0100 Subject: fix debug-and-release builds our lipi build system doesn't use any of the usual prfs, so it needs to deal with dual builds itself. Task-number: QTBUG-56072 Change-Id: Ife44fb4b29c0f55228b97579f4a4d9317e75f0aa Reviewed-by: Jake Petroules --- src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri index df20b654..acbc4c81 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 +qtConfig(debug_and_release): CONFIG += debug_and_release +qtConfig(build_all): CONFIG += build_all + INCLUDEPATH += $$PWD/include load(qt_build_paths) -- cgit v1.2.3 From c2a58836ba4a9671520da132ee2891245a56405f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 1 Dec 2016 15:05:24 +0100 Subject: make debug-and-release fix qt 5.7 compatible qtConfig() is new in 5.8. amends cdd7df86c. Task-number: QTBUG-56072 Change-Id: Ibea8d460165dd2e4eafe366105482ce93078ccc3 Reviewed-by: Mitch Curtis Reviewed-by: Joerg Bornemann Reviewed-by: Jake Petroules --- src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri index acbc4c81..a1b770bb 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri @@ -4,8 +4,8 @@ CONFIG -= qt CONFIG += exceptions CONFIG += warn_off -qtConfig(debug_and_release): CONFIG += debug_and_release -qtConfig(build_all): CONFIG += build_all +contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release +contains(QT_CONFIG, build_all): CONFIG += build_all INCLUDEPATH += $$PWD/include -- cgit v1.2.3