From 192bd214c74aed1b473ed3513352cb6d86b81e78 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 30 Sep 2012 07:26:39 +0200
Subject: [PATCH] qml files: Use buildDirectory as includePath for
app_version_header
Add some missing app_version_header dependencies
Change-Id: Ieaa16e9a1bdace9032ef78a3329dfac60d28e99a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
qtcreator.qbp | 5 +++++
src/plugins/coreplugin/coreplugin.qbs | 4 ++--
src/plugins/help/help.qbs | 4 ++--
src/plugins/macros/macros.qbs | 4 ++--
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 4 ++--
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/qtcreator.qbp b/qtcreator.qbp
index 2eb441acf94..7ba51acdbde 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -131,6 +131,11 @@ Project {
return cmd;
}
}
+
+ ProductModule {
+ Depends { name: "cpp" }
+ cpp.includePaths: product.buildDirectory
+ }
}
Product {
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index cf50a572993..3e08d3d70ec 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -13,6 +13,7 @@ QtcPlugin {
Depends { name: "Utils" }
Depends { name: "ExtensionSystem" }
Depends { name: "Aggregation" }
+ Depends { name: "app_version_header" }
cpp.includePaths: [
".",
@@ -24,8 +25,7 @@ QtcPlugin {
"editormanager",
"progressmanager",
"scriptmanager",
- "actionmanager",
- buildDirectory
+ "actionmanager"
]
cpp.dynamicLibraries: {
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 15e8acd4e5c..4deb59e091d 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -18,6 +18,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "Find" }
Depends { name: "Locator" }
+ Depends { name: "app_version_header" }
Depends { name: "cpp" }
Properties {
@@ -30,8 +31,7 @@ QtcPlugin {
".",
"..",
"../..",
- "../../libs",
- buildDirectory
+ "../../libs"
]
files: [
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 1712dc56613..40eb120dd97 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -10,13 +10,13 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "Find" }
Depends { name: "TextEditor" }
+ Depends { name: "app_version_header" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
"../../libs",
- "../..",
- buildDirectory
+ "../.."
]
files: [
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 9ac468e42c3..025861744fa 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -13,12 +13,12 @@ QtcPlugin {
Depends { name: "QmlJS" }
Depends { name: "Debugger" }
Depends { name: "QtSupport" }
+ Depends { name: "app_version_header" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
- "../../libs",
- buildDirectory
+ "../../libs"
]
files: [
--
GitLab