Update qbs submodule and make use of the new QBS_DESTDIR variable.

Change-Id: I3cc3e1f20fdd122f9f493c25d15902e926fe0ad9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

qtcreator.pro

@@ -21,11 +21,16 @@ OTHER_FILES += dist/copyright_template.txt \
     qbs/pluginspec/pluginspec.qbs
 
 qmake_cache = $$targetPath($$IDE_BUILD_TREE/.qmake.cache)
-unix: maybe_quote = \"
+equals(QMAKE_DIR_SEP, /): {
+    maybe_quote = "\""
+    maybe_backslash = "\\"
+}
 system("echo $${maybe_quote}$${LITERAL_HASH} config for qmake$${maybe_quote} > $$qmake_cache")
 # Make sure the qbs dll ends up alongside the Creator executable.
-win32:exists(src/shared/qbs/qbs.pro) {
+exists(src/shared/qbs/qbs.pro) {
     system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache")
+    system("echo QBS_DESTDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
+    system("echo QBSLIBDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
 }
 
 contains(QT_ARCH, i386): ARCHITECTURE = x86

src/plugins/qbsprojectmanager/qbsprojectmanager.pro

@@ -9,10 +9,9 @@ include(qbsprojectmanager_dependencies.pri)
 QBS_SOURCE_DIR = $$PWD/../../shared/qbs
 QBS_BUILD_DIR = $$IDE_BUILD_TREE/src/shared/qbs
 
-QBSLIBDIR = $$QBS_BUILD_DIR/lib
 include($$QBS_SOURCE_DIR/src/lib/use.pri)
-linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$QBSLIBDIR\'
-macx:QMAKE_LFLAGS += -Wl,-rpath,$$QBSLIBDIR
+# Mac: fix rpath for qbscore soname
+macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../
 
 QBS_BUILD_DIR_FWD_SLASHES = $$replace(QBS_BUILD_DIR, \\\\, /)
 DEFINES += QBS_BUILD_DIR=\\\"$$QBS_BUILD_DIR_FWD_SLASHES\\\"