diff options
Diffstat (limited to 'ogl-runtime.pro')
-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)) } |