From 8dfcc3b0239ffb8af7254280b0fa51770fd4e75b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 23 Nov 2017 19:33:39 +0100
Subject: [PATCH] configure: reset *_LIBS when *_LIBS_{DEBUG|RELEASE} are
 specified

it could be somewhat surprising that specifying variant-specific libs
would not clear the common libs, so do that. of course, the default
for the common libs could theoretically contain common deps of the
variant-specific libs, in which case clearing them would be surprising
in turn - luckily, we have no such case.

Change-Id: Ifca08b9e1949c6a0cefed6931ade4021927d7c90
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 mkspecs/features/qt_configure.prf | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index ecd9233ddd..dcd87a7a1a 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -499,12 +499,6 @@ defineTest(qtConfLibrary_inline) {
     # to make them recognize the same input variables.
     input = $$eval($${2}.alias)
 
-    # direct libs. overwrites inline libs.
-    defined(config.input.$${input}.libs, var) {
-        $${1}.libs = $$eval(config.input.$${input}.libs)
-        export($${1}.libs)
-    }
-
     # build-specific direct libs. overwrites inline libs.
     vars =
     any = false
@@ -527,6 +521,15 @@ defineTest(qtConfLibrary_inline) {
             return(false)
         }
         export($${1}.builds._KEYS_)
+        # we also reset the generic libs, to avoid surprises.
+        $${1}.libs =
+        export($${1}.libs)
+    }
+
+    # direct libs. overwrites inline libs.
+    defined(config.input.$${input}.libs, var) {
+        $${1}.libs = $$eval(config.input.$${input}.libs)
+        export($${1}.libs)
     }
 
     # prefix. prepends to (possibly overwritten) inline libs.