When the qbs submodule is present, build its applications too.

So far, we have only built the library, arguing that that's all
QtC needs from qbs. However, it turns out that it is useful to have
the qbs executable as well, e.g. if there is a problem and the
user wants to quickly compare the behavior of QtC and the
command line tool with the guarantee that they're using the exact
same qbs library.

Task-number: QBS-558
Change-Id: Iddf94a0b304467abee313bcd52e446f02156c98b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

qtcreator.pro

@@ -50,6 +50,10 @@ exists(src/shared/qbs/qbs.pro) {
     }
     system("echo QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache")
     system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache")
+    system("echo QBS_APPS_DESTDIR = $${IDE_BIN_PATH} >> $$qmake_cache")
+    system("echo QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin >> $$qmake_cache")
+    system("echo macx:QBS_APPS_RPATH_DIR = @loader_path/../PlugIns >> $$qmake_cache")
+    system("echo else:QBS_APPS_RPATH_DIR = '\\\$\\\$ORIGIN/../'/lib/qtcreator >> $$qmake_cache")
     system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
 }
 

src/libs/libs.pro

@@ -29,11 +29,14 @@ minQtVersion(5, 0, 0) {
     QBS_DIRS = \
         corelib \
         qtprofilesetup \
+        apps \
         ../shared/qbs/src/plugins \
         ../shared/qbs/static.pro
     corelib.subdir = ../shared/qbs/src/lib/corelib
     qtprofilesetup.subdir = ../shared/qbs/src/lib/qtprofilesetup
     qtprofilesetup.depends = corelib
+    apps.subdir = ../shared/qbs/src/app
+    apps.depends = qtprofilesetup
 
     exists(../shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS
     TR_EXCLUDE = $$QBS_DIRS

src/src.qbs

@@ -23,16 +23,18 @@ Project {
 
         property bool enableUnitTests: false
         property bool installApiHeaders: false
-        property path libInstallDir: project.ide_library_path
-        property path libRPaths:  qbs.targetOS.contains("osx")
-            ? ["@loader_path/.."] : ["$ORIGIN/.."]
-        property path resourcesInstallDir: project.ide_data_path + "/qbs"
+        property string libInstallDir: project.ide_library_path
+        property stringList libRPaths:  qbs.targetOS.contains("osx")
+            ? ["@loader_path/.."] : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path]
+        property string resourcesInstallDir: project.ide_data_path + "/qbs"
         property string pluginsInstallDir: project.libDirName + "/qtcreator"
+        property string appInstallDir: project.ide_libexec_path
 
         references: [
             qbsBaseDir + "/src/lib/libs.qbs",
             qbsBaseDir + "/src/plugins/plugins.qbs",
-            qbsBaseDir + "/share/share.qbs"
+            qbsBaseDir + "/share/share.qbs",
+            qbsBaseDir + "/src/app/apps.qbs",
         ]
     }
 }