aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qtcreator.qbs1
-rw-r--r--src/app/app.qbs4
-rw-r--r--src/plugins/cpaster/cpaster.qbs2
-rw-r--r--src/plugins/debugger/debugger.qbs4
-rw-r--r--src/plugins/designer/designer.qbs2
-rw-r--r--src/plugins/help/help.qbs2
-rw-r--r--src/plugins/ios/ios.qbs1
-rw-r--r--src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs5
-rw-r--r--src/plugins/qtsupport/qtsupport.qbs4
-rw-r--r--src/src.qbs2
-rw-r--r--src/tools/qtcdebugger/qtcdebugger.qbs8
-rw-r--r--tests/auto/ioutils/ioutils.qbs4
-rw-r--r--tests/auto/profilewriter/profilewriter.qbs2
14 files changed, 25 insertions, 18 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 6a9c079324e..8194cc78117 100644
--- a/qtcreator.qbs
+++ b/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"))
diff --git a/src/app/app.qbs b/src/app/app.qbs
index d02e79aac80..c47fde658c0 100644
--- a/src/app/app.qbs
+++ b/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",
- "../shared/qtlockedfile",
+ project.sharedSourcesDir + "/qtsingleapplication",
+ project.sharedSourcesDir + "/qtlockedfile",
]
Depends { name: "app_version_header" }
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",
diff --git a/src/src.qbs b/src/src.qbs
index 34118460ac9..48bf9fc2dff 100644
--- a/src/src.qbs
+++ b/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"]
diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs
index 490ed9d134a..69fb445bcec 100644
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/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",
- "../../shared/registryaccess/registryaccess.h",
+ registryAccessDir + "/registryaccess.cpp",
+ registryAccessDir + "/registryaccess.h",
]
}
diff --git a/tests/auto/ioutils/ioutils.qbs b/tests/auto/ioutils/ioutils.qbs
index 0abf2c96c32..2f9f0ff3c94 100644
--- a/tests/auto/ioutils/ioutils.qbs
+++ b/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])
}
diff --git a/tests/auto/profilewriter/profilewriter.qbs b/tests/auto/profilewriter/profilewriter.qbs
index e05ec165661..03de7d00d37 100644
--- a/tests/auto/profilewriter/profilewriter.qbs
+++ b/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",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 22:37:17 +0000