From 0c382efc79aed3656755b98441490aeede32efba Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Tue, 28 Jun 2016 15:56:09 +0200
Subject: use globally available constants

configure_base.prf gained them in a bugfix in 5.6.

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

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index cae6dd13f0..0c8ddd6f3d 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -285,16 +285,9 @@ defineReplace(qtConfFindInPath) {
 }
 
 defineReplace(qtConfPkgConfigEnv) {
-    equals(QMAKE_HOST.os, Windows) {
-        pfx = "set "
-        sfx = "&"
-    } else {
-        pfx =
-        sfx =
-    }
     env =
-    !isEmpty(PKG_CONFIG_SYSROOT_DIR): env += "$${pfx}PKG_CONFIG_SYSROOT_DIR=$${PKG_CONFIG_SYSROOT_DIR}$${sfx}"
-    !isEmpty(PKG_CONFIG_LIBDIR): env += "$${pfx}PKG_CONFIG_LIBDIR=$${PKG_CONFIG_LIBDIR}$${sfx}"
+    !isEmpty(PKG_CONFIG_SYSROOT_DIR): env += "$${SETENV_PFX}PKG_CONFIG_SYSROOT_DIR=$${PKG_CONFIG_SYSROOT_DIR}$${SETENV_SFX}"
+    !isEmpty(PKG_CONFIG_LIBDIR): env += "$${SETENV_PFX}PKG_CONFIG_LIBDIR=$${PKG_CONFIG_LIBDIR}$${SETENV_SFX}"
     return($$env)
 }
 
-- 
cgit v1.2.3