From 26e9a6a5149aca056418ad55402231191a48cdbf Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 23 Nov 2017 19:19:36 +0100
Subject: configure: make *_LIBS_{DEBUG|RELEASE} always work

... and not only when the source explicitly specifies build variants.

Change-Id: Iac6c8fda8f431d5fb50fada8338d1b660ab040d7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 mkspecs/features/qt_configure.prf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'mkspecs/features')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 658bd59e5e..ecd9233ddd 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -509,20 +509,24 @@ defineTest(qtConfLibrary_inline) {
     vars =
     any = false
     all = true
-    for (b, $${1}.builds._KEYS_) {
+    for (b, $$list(debug release)) {
         iv = $${input}.libs.$${b}
         vars += $$eval(config.commandline.rev_assignments.$${iv})
         defined(config.input.$${iv}, var) {
             $${1}.builds.$${b} = $$eval(config.input.$${iv})
             export($${1}.builds.$${b})
+            $${1}.builds._KEYS_ *= $${b}
             any = true
         } else {
             all = false
         }
     }
-    $$any:!$$all {
-        qtConfAddError("Either none or all of $$join(vars, ", ", [, ]) must be specified.")
-        return(false)
+    $$any {
+        !$$all {
+            qtConfAddError("Either none or all of $$join(vars, ", ", [, ]) must be specified.")
+            return(false)
+        }
+        export($${1}.builds._KEYS_)
     }
 
     # prefix. prepends to (possibly overwritten) inline libs.
-- 
cgit v1.2.3