AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beautify generated spacing

Browse Source 
don't have extra spaces in the pkg-config calls when no environment
variables are injected.

Change-Id: Ieb14f775b2a04726e8f62114b69d9be7fa662eb0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-06-28 16:22:34 +02:00
parent 0c382efc79
commit 16203353d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/qt_configure.prf
View File

@ -286,8 +286,8 @@ defineReplace(qtConfFindInPath) {
defineReplace(qtConfPkgConfigEnv) { defineReplace(qtConfPkgConfigEnv) {
env = env =
!isEmpty(PKG_CONFIG_SYSROOT_DIR): env += "$${SETENV_PFX}PKG_CONFIG_SYSROOT_DIR=$${PKG_CONFIG_SYSROOT_DIR}$${SETENV_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}" !isEmpty(PKG_CONFIG_LIBDIR): env = "$$env$${SETENV_PFX}PKG_CONFIG_LIBDIR=$${PKG_CONFIG_LIBDIR}$${SETENV_SFX} "
return($$env) return($$env)
} }
@ -300,7 +300,7 @@ defineReplace(qtConfPkgConfig) {
isEmpty(pkg_config): \ isEmpty(pkg_config): \
return(false) return(false)
} else { } else {
pkg_config = "$$qtConfPkgConfigEnv() $$PKG_CONFIG" pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG"
} }
return($$pkg_config) return($$pkg_config)