1 files changed, 10 insertions, 11 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 79b4eab949..78be2e8473 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -86,7 +86,7 @@ defineTest(qtAddModule) {
     unset(LINKAGE)
     mac:contains(MODULE_CONFIG, lib_bundle) {
           FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers
-          !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+          !qt_no_framework_direct_includes {
                INCLUDEPATH *= $$FRAMEWORK_INCLUDE
           }
           contains(MODULE_CONFIG, internal_module): \
@@ -238,11 +238,12 @@ defineTest(qtAddToolEnv) {
             equals(ds, /) {
                 contains($${env}.CONFIG, prepend): infix = \${$$name:+:\$$$name}
                 else: infix =
-                val = "$$name=$$join(value, :)$$infix"
+                val = "$$name=$$shell_quote($$join(value, :))$$infix"
             } else {
                 # Escape closing parens when expanding the variable, otherwise cmd confuses itself.
                 contains($${env}.CONFIG, prepend): infix = ;%$$name:)=^)%
                 else: infix =
+                value ~= s,\\),^),g
                 val = "(set $$name=$$join(value, ;)$$infix) &"
             }
             isEmpty(3): !contains(TEMPLATE, vc.*) {
@@ -272,6 +273,8 @@ defineTest(qtAddTargetEnv) {
             deppath.name = PATH
         } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
             deppath.name = LD_LIBRARY_PATH
+        } else:contains(QMAKE_HOST.os, Haiku) {
+            deppath.name = LIBRARY_PATH
         } else:equals(QMAKE_HOST.os, Darwin) {
             contains(QT_CONFIG, qt_framework): \
                 deppath.name = DYLD_FRAMEWORK_PATH
@@ -308,15 +311,11 @@ defineReplace(pkgConfigExecutable) {
     isEmpty(PKG_CONFIG) {
         PKG_CONFIG = pkg-config
 
-        !isEmpty(PKG_CONFIG_SYSROOT_DIR) {
-            win32:isEmpty(MINGW_IN_SHELL):PKG_CONFIG = set PKG_CONFIG_SYSROOT_DIR=$$PKG_CONFIG_SYSROOT_DIR& $$PKG_CONFIG
-            else:PKG_CONFIG = PKG_CONFIG_SYSROOT_DIR=\"$$PKG_CONFIG_SYSROOT_DIR\" $$PKG_CONFIG
-        }
-
-        !isEmpty(PKG_CONFIG_LIBDIR) {
-            win32:isEmpty(MINGW_IN_SHELL):PKG_CONFIG = set PKG_CONFIG_LIBDIR=$$PKG_CONFIG_LIBDIR& $$PKG_CONFIG
-            else:PKG_CONFIG = PKG_CONFIG_LIBDIR=\"$$PKG_CONFIG_LIBDIR\" $$PKG_CONFIG
-        }
+        sysroot.name = PKG_CONFIG_SYSROOT_DIR
+        sysroot.value = $$PKG_CONFIG_SYSROOT_DIR
+        libdir.name = PKG_CONFIG_LIBDIR
+        libdir.value = $$PKG_CONFIG_LIBDIR
+        qtAddToolEnv(PKG_CONFIG, sysroot libdir, SYS)
     }
 
     equals(QMAKE_HOST.os, Windows): \