diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-28 16:22:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-28 18:23:39 +0000 |
| commit | 16203353d0ada1737356cba10fa51f8f67f80a97 (patch) | |
| tree | 993873ddd456742fe13a35f011e9da1a7a2c42b9 | |
| parent | 0c382efc79aed3656755b98441490aeede32efba (diff) | |
beautify generated spacing
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>
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 0c8ddd6f3d..e67d3b93b1 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -286,8 +286,8 @@ defineReplace(qtConfFindInPath) { defineReplace(qtConfPkgConfigEnv) { env = - !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_SYSROOT_DIR): env = "$${SETENV_PFX}PKG_CONFIG_SYSROOT_DIR=$${PKG_CONFIG_SYSROOT_DIR}$${SETENV_SFX} " + !isEmpty(PKG_CONFIG_LIBDIR): env = "$$env$${SETENV_PFX}PKG_CONFIG_LIBDIR=$${PKG_CONFIG_LIBDIR}$${SETENV_SFX} " return($$env) } @@ -300,7 +300,7 @@ defineReplace(qtConfPkgConfig) { isEmpty(pkg_config): \ return(false) } else { - pkg_config = "$$qtConfPkgConfigEnv() $$PKG_CONFIG" + pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG" } return($$pkg_config) |