From 85f2bdea445d3e1c610d81e57795290bc0e4a503 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 26 Aug 2016 19:22:17 +0200
Subject: [PATCH] unbreak pkg-config use with cache

test callbacks MUST NOT act as outputs, ever.

this went unnoticed so far, as it would become visible only with
configure -recheck.

Change-Id: Idd923097b4b2790ef4fe8a6d430db4b62851801a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 configure.pri | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.pri b/configure.pri
index 21ceb68d33..8c87aaed81 100644
--- a/configure.pri
+++ b/configure.pri
@@ -191,9 +191,6 @@ defineTest(qtConfTest_detectPkgConfig) {
     $${1}.cache += pkgConfig
     export($${1}.cache)
 
-    PKG_CONFIG = $$pkgConfig
-    export(PKG_CONFIG)
-
     return(true)
 }
 
@@ -526,6 +523,8 @@ defineTest(qtConfOutput_qreal) {
 defineTest(qtConfOutput_pkgConfig) {
     !$${2}: return()
 
+    PKG_CONFIG = $$eval(config.tests.pkg-config.pkgConfig)
+    export(PKG_CONFIG)
     # this method also exports PKG_CONFIG_(LIB|SYSROOT)DIR, so that tests using pkgConfig will work correctly
     PKG_CONFIG_SYSROOT_DIR = $$eval(config.tests.pkg-config.pkgConfigSysrootDir)
     !isEmpty(PKG_CONFIG_SYSROOT_DIR) {