summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatiana Borisova <tatiana.borisova@qt.io>2022-03-30 15:37:29 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-04-07 06:54:12 +0000
commit22057030cfc2670c7bc756ea6689562f14d726a5 (patch)
tree7736915c742be5eb6d067edb2ddf38e496f7096d
parent66d1b71889a57cbd2a8d2cca6c1da945a6ca3d9c (diff)
CMake uses Desktop tslib for INTEGRITY configuration by mistake
IGY doesn't provide tslib backend. QT_FEATURE_tslib should be OFF. Task-number: QTBUG-102121 Change-Id: Id6417b92864312f6437c773a472aff8517b6e5dc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 64fc50e309f51e7c837c133cb4ccc4ca4d8a87a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/gui/configure.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 6255bd4b1b..65e4ae81e6 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -879,7 +879,7 @@ qt_feature("sessionmanager" PUBLIC
qt_feature_definition("sessionmanager" "QT_NO_SESSIONMANAGER" NEGATE VALUE "1")
qt_feature("tslib" PRIVATE
LABEL "tslib"
- CONDITION Tslib_FOUND
+ CONDITION Tslib_FOUND AND NOT INTEGRITY
)
qt_feature("tuiotouch" PRIVATE
LABEL "TuioTouch"