whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2016-06-28 15:56:09 +02:00
parent 0dc5d8e6c9
commit 0c382efc79
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkspecs/features/qt_configure.prf
View File

@ -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)
}