summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-06-12 14:32:52 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-06-12 14:32:52 +0300
commit903c274f7d19d391323c4bd9e7186f45aee87944 (patch)
treea4dddba46bfdeb5a4b0eda9fc6190e79fcc456ed
parent255602174d33c838e91b1967443abc637dd856b3 (diff)
Fix integrity dir checkv2.4.0-beta3
Change-Id: Id9d1138530e12f6c3ceb80ae7acd7957aa8abf7b Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
-rw-r--r--ogl-runtime.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/ogl-runtime.pro b/ogl-runtime.pro
index 18be6a1..d5345cb 100644
--- a/ogl-runtime.pro
+++ b/ogl-runtime.pro
@@ -5,9 +5,11 @@ requires(!watchos)
requires(!winrt)
requires(!wasm)
-INTEGRITY_DIR = $$(INTEGRITY_DIR)
+integrity {
+ CHECK_INTEGRITY_DIR = $$(INTEGRITY_DIR)
+}
-ios|qnx|tvos|watchos|winrt|wasm|*-icc*|contains(INTEGRITY_DIR, .*int1144$) {
+ios|qnx|tvos|watchos|winrt|wasm|*-icc*|contains(CHECK_INTEGRITY_DIR, .*int1144$) {
message("WARNING, target not supported by ogl-runtime")
#Exclude non-working cross-compile targets, see:
# QT3DS-3645 ogl-runtime doesn't compile on INTEGRITY_11_04 in CI