qbs build: Introduce convenience project property sharedSourcesDir.

Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <[email protected]>

8 files changed, 13 insertions, 9 deletions

diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 033b570b8ee..4b3cb99a84f 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -9,7 +9,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
 
-    cpp.includePaths: base.concat("../../shared/cpaster")
+    cpp.includePaths: base.concat([project.sharedSourcesDir + "/cpaster"])
 
     files: [
         "columnindicatortextedit.cpp",
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 7001f560b3f..f6a49138c03 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -17,7 +17,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
 
-    cpp.includePaths: base.concat(["../../shared/registryaccess"])
+    cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"])
 
     pluginRecommends: [
         "CppEditor"
@@ -214,7 +214,7 @@ QtcPlugin {
     Group {
         name: "RegistryAccess"
         condition: qbs.targetOS.contains("windows")
-        prefix: "../../shared/registryaccess/"
+        prefix: project.sharedSourcesDir + "/registryaccess/"
         files: [
             "registryaccess.cpp",
             "registryaccess.h",
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 0cc3c0b514e..1029d77e83b 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -49,7 +49,7 @@ QtcPlugin {
     Group {
         name: "Shared Sources"
         id: sharedSources
-        prefix: "../../shared/designerintegrationv2/"
+        prefix: project.sharedSourcesDir + "/designerintegrationv2/"
         files: [
             "formresizer.cpp", "formresizer.h",
             "sizehandlerect.cpp", "sizehandlerect.h",
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index af3d320666f..20d225ae6d3 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -64,7 +64,7 @@ QtcPlugin {
     Group {
         id: sharedSources
         name: "Shared Sources"
-        prefix: "../../shared/help/"
+        prefix: project.sharedSourcesDir + "/help/"
         files: [
             "bookmarkdialog.ui",
             "bookmarkmanager.cpp", "bookmarkmanager.h",
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index 91f9c86eb9b..44924381436 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
-    cpp.includePaths: base.concat("../../shared")
     cpp.frameworks: base.concat(qbs.targetOS.contains("osx") ? ["CoreFoundation", "IOKit"] : [])
 
     files: [
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs
index 5566daa83ef..a2a25ae27e2 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs
@@ -16,7 +16,7 @@ QtcPlugin {
     Depends { name: "Qt.widgets" }
 
     cpp.includePaths: base.concat([
-        "../../shared",
+        project.sharedSourcesDir,
     ])
 
     files: [
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
index 950d7a7d73f..5f36819cb95 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
@@ -121,4 +121,9 @@ QtcPlugin {
             "qtquickapp.png",
         ]
     }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [project.sharedSourcesDir]
+    }
 }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 9ef7bb7a9c1..9b43f4bb98b 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -13,7 +13,7 @@ QtcPlugin {
     Depends { name: "CppTools" }
 
     cpp.includePaths: base.concat([
-        "../../shared",
+        project.sharedSourcesDir,
     ])
 
     cpp.defines: base.concat([
@@ -28,7 +28,7 @@ QtcPlugin {
 
     Group {
         name: "Shared"
-        prefix: "../../shared/proparser/"
+        prefix: project.sharedSourcesDir + "/proparser/"
         files: [
             "ioutils.cpp",
             "ioutils.h",