4 files changed, 7 insertions, 5 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs
index af6eb04bad6..faa3900a995 100644
--- a/qbs/imports/QtcLibrary.qbs
+++ b/qbs/imports/QtcLibrary.qbs
@@ -1,10 +1,11 @@
 import qbs 1.0
+import qbs.FileInfo
 import QtcFunctions
 
 QtcProduct {
     type: ["dynamiclibrary", "dynamiclibrary_symlink", "qtc.dev-module"]
     installDir: qtc.ide_library_path
-    installTags: ["dynamiclibrary", "dynamiclibrary_symlink"]
+    installTags: ["dynamiclibrary", "dynamiclibrary_symlink", "debuginfo_dll"]
     useNonGuiPchFile: true
     Depends {
         condition: qtc.testsEnabled
@@ -12,7 +13,7 @@ QtcProduct {
     }
 
     targetName: QtcFunctions.qtLibraryName(qbs, name)
-    destinationDirectory: qtc.ide_library_path
+    destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_library_path)
 
     cpp.linkerFlags: {
         var flags = base;
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index 25d7bcaa762..95198a62ef4 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -5,7 +5,7 @@ import QtcFunctions
 QtcProduct {
     type: ["dynamiclibrary", "pluginSpec", "qtc.dev-module"]
     installDir: qtc.ide_plugin_path
-    installTags: ["dynamiclibrary"]
+    installTags: ["dynamiclibrary", "debuginfo_dll"]
     useGuiPchFile: true
 
     property var pluginJsonReplacements
@@ -13,7 +13,7 @@ QtcProduct {
     property var pluginTestDepends: []
 
     targetName: QtcFunctions.qtLibraryName(qbs, name)
-    destinationDirectory: qtc.ide_plugin_path
+    destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_plugin_path)
 
     Depends { name: "ExtensionSystem" }
     Depends { name: "pluginjson" }
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index f7b53981264..ef19ce49876 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -8,7 +8,7 @@ Product {
     version: qtc.qtcreator_version
     property bool install: true
     property string installDir
-    property string installSourceBase
+    property string installSourceBase: destinationDirectory
     property stringList installTags: type
     property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs"
     property bool useNonGuiPchFile: false
diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs
index 304e2e87a95..1b389686502 100644
--- a/qbs/imports/QtcTool.qbs
+++ b/qbs/imports/QtcTool.qbs
@@ -5,6 +5,7 @@ QtcProduct {
     type: ["application"]
     consoleApplication: true
     installDir:  qtc.ide_libexec_path
+    installTags: base.concat(["debuginfo_app"])
     useNonGuiPchFile: true
 
     cpp.rpaths: {