From 903c274f7d19d391323c4bd9e7186f45aee87944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Wed, 12 Jun 2019 14:32:52 +0300 Subject: Fix integrity dir check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id9d1138530e12f6c3ceb80ae7acd7957aa8abf7b Reviewed-by: Pasi Keränen Reviewed-by: Kaj Grönholm --- ogl-runtime.pro | 6 ++++-- 1 file 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 -- cgit v1.2.3