qbs build: Introduce convenience project property sharedSourcesDir.

Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

qtcreator.qbs

@@ -18,6 +18,7 @@ Project {
     property pathList additionalLibs: []
     property pathList additionalTools: []
     property pathList additionalAutotests: []
+    property string sharedSourcesDir: path + "/src/shared"
     property string libDirName: "lib"
     property string ide_library_path: {
         if (qbs.targetOS.contains("osx"))

src/app/app.qbs

@@ -8,8 +8,8 @@ QtcProduct {
     cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
                                              : ["$ORIGIN/../" + project.libDirName + "/qtcreator"]
     cpp.includePaths: [
-        "../shared/qtsingleapplication",
+        project.sharedSourcesDir + "/qtsingleapplication",
-        "../shared/qtlockedfile",
+        project.sharedSourcesDir + "/qtlockedfile",
     ]
 
     Depends { name: "app_version_header" }

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",

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",

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",

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",

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: [

src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs

@@ -16,7 +16,7 @@ QtcPlugin {
     Depends { name: "Qt.widgets" }
 
     cpp.includePaths: base.concat([
-        "../../shared",
+        project.sharedSourcesDir,
     ])
 
     files: [

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs

@@ -121,4 +121,9 @@ QtcPlugin {
             "qtquickapp.png",
         ]
     }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: [project.sharedSourcesDir]
+    }
 }

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",

src/src.qbs

@@ -19,7 +19,7 @@ Project {
     Project {
         name: "qbs"
         id: qbsProject
-        property string qbsBaseDir: path + "/shared/qbs"
+        property string qbsBaseDir: project.sharedSourcesDir + "/qbs"
         condition: qbsSubModuleExists && !useExternalQbs
         qbsSearchPaths: [qbsBaseDir + "/qbs-resources"]
 

src/tools/qtcdebugger/qtcdebugger.qbs

@@ -4,7 +4,9 @@ QtcTool {
     name: "qtcdebugger"
     condition: qbs.targetOS.contains("windows")
 
-    cpp.includePaths: base.concat(["../../shared/registryaccess"])
+    property string registryAccessDir: project.sharedSourcesDir + "/registryaccess"
+
+    cpp.includePaths: base.concat([registryAccessDir])
     cpp.dynamicLibraries: [
         "psapi",
         "advapi32"
@@ -15,7 +17,7 @@ QtcTool {
 
     files: [
         "main.cpp",
-        "../../shared/registryaccess/registryaccess.cpp",
+        registryAccessDir + "/registryaccess.cpp",
-        "../../shared/registryaccess/registryaccess.h",
+        registryAccessDir + "/registryaccess.h",
     ]
 }

tests/auto/ioutils/ioutils.qbs

@@ -4,8 +4,8 @@ QtcAutotest {
     name: "IoUtils autotest"
     Depends { name: "Qt.core" }
     files: [
-        project.ide_source_tree + "/src/shared/proparser/ioutils.cpp",
+        project.sharedSourcesDir + "/proparser/ioutils.cpp",
         "tst_ioutils.cpp"
     ]
-    cpp.includePaths: base.concat([project.ide_source_tree + "/src/shared"])
+    cpp.includePaths: base.concat([project.sharedSourcesDir])
 }

tests/auto/profilewriter/profilewriter.qbs

@@ -6,7 +6,7 @@ QtcAutotest {
     Group {
         name: "Sources from ProParser"
         id: proParserGroup
-        prefix: project.ide_source_tree + "/src/shared/proparser/"
+        prefix: project.sharedSourcesDir + "/proparser/"
         files: [
             "ioutils.h", "ioutils.cpp",
             "profileevaluator.h", "profileevaluator.cpp",