diff options
Diffstat (limited to 'src/Runtime/Runtime.pro')
| -rw-r--r-- | src/Runtime/Runtime.pro | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/Runtime/Runtime.pro b/src/Runtime/Runtime.pro index a23a91a0..8b07be9d 100644 --- a/src/Runtime/Runtime.pro +++ b/src/Runtime/Runtime.pro @@ -1,20 +1,14 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += \ - ogl-runtime \ +SUBDIRS += ogl-runtime -# Qt3D based runtime needs Qt 5.11 or later -greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 10) { - SUBDIRS += qt3d-runtime - - # HACK to ensure syncqt is run for qt3d-runtime if one is run for studio - # This is necessary because CI doesn't create dummy .git directories for submodules - if(!build_pass|!debug_and_release) { - # Pro file existence is checked to ensure we don't create dummy .git in empty submodule dir, - # which happens when studio is cloned without --recursive option - exists($$PWD/../../.git):!exists($$PWD/qt3d-runtime/.git):exists($$PWD/qt3d-runtime/qt3d-runtime.pro) { - MAKE_DIR_CMD = $$sprintf($$QMAKE_MKDIR_CMD, $$shell_quote($$shell_path($$PWD/qt3d-runtime/.git))) - $$system("$$MAKE_DIR_CMD") - } +# HACK to ensure syncqt is run for ogl-runtime if one is run for studio +# This is necessary because CI doesn't create dummy .git directories for submodules +if(!build_pass|!debug_and_release) { + # Pro file existence is checked to ensure we don't create dummy .git in empty submodule dir, + # which happens when studio is cloned without --recursive option + exists($$PWD/../../.git):!exists($$PWD/ogl-runtime/.git):exists($$PWD/ogl-runtime/ogl-runtime.pro) { + MAKE_DIR_CMD = $$sprintf($$QMAKE_MKDIR_CMD, $$shell_quote($$shell_path($$PWD/ogl-runtime/.git))) + $$system("$$MAKE_DIR_CMD") } } |