From d6778c3597a6e06b866c5b7a994cac4d71aaead3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 3 Jan 2017 19:47:03 +0100
Subject: make skipping of configure in sub-repos less arcane

this was introduced in 60e5a1c8 for no apparent reason.

Change-Id: Idcbc6df3df4e4846c76b3e4215d753a1c97e2eec
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt_configure.prf | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'mkspecs/features/qt_configure.prf')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 8eb8f22347..7e2e5cfecc 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -1698,16 +1698,18 @@ defineTest(qtConfProcessOutput) {
 # tie it all together
 #
 
-cfgs =
-isEmpty(_QMAKE_SUPER_CACHE_)|equals(OUT_PWD, $$dirname(_QMAKE_SUPER_CACHE_)) {
-    c = $$basename(_PRO_FILE_PWD_)
-    config.$${c}.dir = $$_PRO_FILE_PWD_
-    cfgs += $$c
-    !isEmpty(_QMAKE_SUPER_CACHE_) {
-        for (s, SUBDIRS) {
-            config.$${s}.dir = $$_PRO_FILE_PWD_/$${s}
-            cfgs += $$s
-        }
+!isEmpty(_QMAKE_SUPER_CACHE_):!equals(OUT_PWD, $$dirname(_QMAKE_SUPER_CACHE_)) {
+    # sub-repo within a top-level build; no need to configure anything.
+    return()
+}
+
+c = $$basename(_PRO_FILE_PWD_)
+config.$${c}.dir = $$_PRO_FILE_PWD_
+cfgs = $$c
+!isEmpty(_QMAKE_SUPER_CACHE_) {
+    for (s, SUBDIRS) {
+        config.$${s}.dir = $$_PRO_FILE_PWD_/$${s}
+        cfgs += $$s
     }
 }
 configsToProcess =
-- 
cgit v1.2.3