diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-28 15:56:09 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-28 18:23:34 +0000 |
| commit | 0c382efc79aed3656755b98441490aeede32efba (patch) | |
| tree | 428c5d2b8b923f280c27b6974951fb8eb87c2000 | |
| parent | 0dc5d8e6c92546d83dc84619eb653c6e389edaf1 (diff) | |
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>
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 11 |
1 files 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) } |