diff options
author | Pasi Keränen <pasi.keranen@qt.io> | 2019-06-10 16:44:45 +0300 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@qt.io> | 2019-06-11 07:49:11 +0300 |
commit | b04500be2085335d8377576a34db5d78ceb52d65 (patch) | |
tree | 78e0ee4b0ad8d1038ccb0997a1d1328c9bf2e2f1 | |
parent | 2025912174c4cf99270b7439ec3b021e1d089aee (diff) |
Only disable Integrity 11.44 target
Integrity 11.44 is 32-bit and has too old compiler for ogl-runtime to support.
As it's default target in Qt CI it needs to be hand picked and exluded.
Task-number: QT3DS-3645
Change-Id: I689a670e986acd3cb2614071ebe12ecff6a53141
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
-rw-r--r-- | ogl-runtime.pro | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ogl-runtime.pro b/ogl-runtime.pro index e4bac15..e7d061a 100644 --- a/ogl-runtime.pro +++ b/ogl-runtime.pro @@ -1,13 +1,12 @@ requires(!ios) -requires(!integrity) requires(!qnx) requires(!tvos) requires(!watchos) requires(!winrt) requires(!wasm) -ios|integrity|qnx|tvos|watchos|winrt|wasm|*-icc*: { - message("WARNING, target excluded from ogl-runtime") +ios|qnx|tvos|watchos|winrt|wasm|*-icc*|!contains(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 # QT3DS-3647 ogl-runtime doesn't compile on TvOS_ANY in CI @@ -20,13 +19,6 @@ ios|integrity|qnx|tvos|watchos|winrt|wasm|*-icc*: { CONFIG += ordered SUBDIRS += src_dummy } else { - contains(QMAKE_TARGET.os, WinRT)|contains(QMAKE_TARGET.os, TvOS)|contains(QMAKE_TARGET.os, IOS)|contains(QMAKE_TARGET.os, WatchOS)|contains(QMAKE_TARGET.os, INTEGRITY)|contains(QMAKE_TARGET.os, QNX) { - message("WARNING, target OS excluded from ogl-runtime") - TEMPLATE = subdirs - CONFIG += ordered - SUBDIRS += src_dummy - } else { - load(qt_parts) - requires(qtHaveModule(opengl)) - } + load(qt_parts) + requires(qtHaveModule(opengl)) } |