From 614bb33589aa1fade05cd1b6b32b3acc848f2fd8 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 27 Sep 2012 17:20:00 +0200
Subject: [PATCH] qbs files: Consolidate includePaths in QtcLibrary and
QtcPlugin
Avoid using "." as includePath when it is unneeded
Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
src/libs/3rdparty/botan/botan.qbs | 3 +--
src/libs/QtcLibrary.qbs | 6 +++++
src/libs/aggregation/aggregation.qbs | 5 -----
src/libs/cplusplus/cplusplus.qbs | 8 +------
src/libs/extensionsystem/extensionsystem.qbs | 4 ----
src/libs/glsl/glsl.qbs | 9 --------
src/libs/languageutils/languageutils.qbs | 6 +----
src/libs/qmldebug/qmldebug.qbs | 9 --------
src/libs/qmleditorwidgets/colorbox.h | 2 +-
src/libs/qmleditorwidgets/colorbutton.h | 2 +-
src/libs/qmleditorwidgets/colorwidgets.h | 2 +-
.../qmleditorwidgets/contextpanetextwidget.h | 2 +-
src/libs/qmleditorwidgets/contextpanewidget.h | 2 +-
.../qmleditorwidgets/contextpanewidgetimage.h | 4 ++--
.../contextpanewidgetrectangle.h | 2 +-
src/libs/qmleditorwidgets/customcolordialog.h | 2 +-
src/libs/qmleditorwidgets/filewidget.h | 2 +-
src/libs/qmleditorwidgets/fontsizespinbox.h | 2 +-
src/libs/qmleditorwidgets/gradientline.h | 2 +-
src/libs/qmleditorwidgets/huecontrol.h | 2 +-
.../qmleditorwidgets/qmleditorwidgets.qbs | 11 +---------
src/libs/qmljs/qmljs.qbs | 10 +--------
src/libs/ssh/ssh.qbs | 8 -------
src/libs/utils/crumblepath.cpp | 3 +--
src/libs/utils/filewizardpage.ui | 2 +-
src/libs/utils/synchronousprocess.cpp | 3 +--
src/libs/utils/utils.qbs | 8 -------
src/libs/zeroconf/zeroconf.qbs | 7 +-----
src/plugins/QtcPlugin.qbs | 1 +
src/plugins/analyzerbase/analyzerbase.qbs | 8 -------
src/plugins/android/android.qbs | 7 +-----
.../autotoolsprojectmanager.qbs | 6 -----
src/plugins/bazaar/bazaar.qbs | 5 -----
src/plugins/bineditor/bineditor.qbs | 5 -----
src/plugins/bookmarks/bookmarks.qbs | 5 -----
src/plugins/classview/classview.qbs | 5 -----
src/plugins/clearcase/clearcase.qbs | 6 -----
.../cmakeprojectmanager.qbs | 8 -------
src/plugins/coreplugin/coreplugin.qbs | 15 +++----------
.../coreplugin/inavigationwidgetfactory.h | 2 +-
.../progressmanager/progressmanager.cpp | 4 ++--
src/plugins/cpaster/cpaster.qbs | 8 +------
src/plugins/cppeditor/cppeditor.qbs | 9 ++------
src/plugins/cpptools/cppfunctionsfilter.h | 2 +-
src/plugins/cpptools/cpptools.qbs | 7 ------
src/plugins/cvs/cvs.qbs | 7 ------
src/plugins/debugger/debugger.qbs | 11 +++-------
src/plugins/designer/designer.qbs | 11 +++-------
src/plugins/fakevim/fakevim.qbs | 7 ------
src/plugins/find/find.qbs | 11 +++-------
.../genericprojectmanager.qbs | 8 -------
src/plugins/git/gerrit/gerritplugin.cpp | 8 +++----
src/plugins/git/git.qbs | 9 --------
.../git/gitorious/gitoriousclonewizard.cpp | 4 ++--
src/plugins/git/gitplugin.cpp | 4 ++--
src/plugins/glsleditor/glsleditor.qbs | 9 --------
src/plugins/helloworld/helloworld.qbs | 7 ------
src/plugins/help/help.qbs | 9 +-------
src/plugins/imageviewer/imageviewer.qbs | 9 --------
src/plugins/locator/locator.qbs | 11 +++-------
src/plugins/macros/macros.qbs | 8 -------
src/plugins/madde/madde.qbs | 5 -----
src/plugins/mercurial/mercurial.qbs | 8 -------
src/plugins/perforce/perforce.qbs | 8 -------
.../projectexplorer/applicationlauncher.cpp | 2 +-
src/plugins/projectexplorer/processstep.h | 3 ++-
src/plugins/projectexplorer/project.cpp | 2 +-
.../projectexplorer/projectexplorer.qbs | 16 +++++---------
src/plugins/qmldesigner/qmldesigner.qbs | 10 +++------
src/plugins/qmljseditor/qmljseditor.qbs | 7 ------
src/plugins/qmljseditor/quicktoolbar.cpp | 6 ++---
src/plugins/qmljstools/qmljstools.qbs | 8 +------
src/plugins/qmlprofiler/qmlprofiler.qbs | 8 +------
.../qmlprojectmanager/qmlprojectmanager.qbs | 7 ------
src/plugins/qnx/qnx.qbs | 7 +-----
.../qt-desktop/desktopqtversion.cpp | 2 +-
.../qt-desktop/desktopqtversionfactory.cpp | 2 +-
.../qt-desktop/qt4runconfiguration.cpp | 12 +++++-----
.../qt4projectmanager/qt4projectmanager.qbs | 22 +++++++------------
src/plugins/qtsupport/qtsupport.qbs | 12 ++++------
src/plugins/remotelinux/remotelinux.qbs | 7 ------
src/plugins/resourceeditor/resourceeditor.qbs | 10 +--------
src/plugins/subversion/subversion.qbs | 7 ------
src/plugins/tasklist/tasklist.qbs | 7 ------
.../generichighlighter/highlighter.h | 4 ++--
.../highlightersettingspage.h | 2 +-
.../snippets/snippetssettingspage.h | 2 +-
src/plugins/texteditor/texteditor.qbs | 11 +++-------
src/plugins/todo/todo.qbs | 5 -----
.../callgrind/callgrindcontroller.cpp | 3 +--
.../valgrind/callgrind/callgrindrunner.h | 2 +-
.../valgrind/memcheck/memcheckrunner.cpp | 6 ++---
.../valgrind/memcheck/memcheckrunner.h | 2 +-
src/plugins/valgrind/valgrind.qbs | 10 ---------
src/plugins/vcsbase/checkoutjobs.cpp | 4 ++--
src/plugins/vcsbase/vcsbase.qbs | 9 --------
src/plugins/welcome/welcome.qbs | 9 +-------
src/tools/sdktool/sdktool.qbs | 8 +++----
98 files changed, 120 insertions(+), 499 deletions(-)
diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index ee8afc1d033..3743e8d27ab 100644
--- a/src/libs/3rdparty/botan/botan.qbs
+++ b/src/libs/3rdparty/botan/botan.qbs
@@ -7,7 +7,6 @@ QtcLibrary {
Depends { name: "cpp" }
Depends { name: "Qt.core" }
- cpp.includePaths: '.'
cpp.dynamicLibraries: {
if (qbs.targetOS == "windows") {
return [
@@ -65,6 +64,6 @@ QtcLibrary {
return ["-Wl,--enable-auto-import"]
}
}
- cpp.includePaths: '..'
+ cpp.includePaths: ".."
}
}
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 85ba60ab89c..3e97e4a59d2 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -13,6 +13,7 @@ DynamicLibrary {
if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
return ["-Wl,-s"]
}
+ cpp.includePaths: [ "." ]
destination: {
if (qbs.targetOS == "windows")
@@ -20,4 +21,9 @@ DynamicLibrary {
else
return "lib/qtcreator"
}
+
+ ProductModule {
+ Depends { name: "cpp" }
+ cpp.includePaths: [ "." ]
+ }
}
diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index 5b64ea423fa..a5e8e84d396 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -4,12 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "Aggregation"
- cpp.includePaths: [
- ".",
- ".."
- ]
cpp.defines: base.concat("AGGREGATION_LIBRARY")
-
Depends { name: "cpp" }
Depends { name: "Qt.core" }
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 7b9e98d04ac..db321ded657 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -4,12 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "CPlusPlus"
- cpp.includePaths: [
- ".",
- "..",
- "../3rdparty/cplusplus",
- "../../plugins"
- ]
+ cpp.includePaths: base.concat("../3rdparty/cplusplus")
cpp.defines: base.concat([
"NDEBUG",
"CPLUSPLUS_BUILD_LIB"
@@ -181,4 +176,3 @@ QtcLibrary {
]
}
}
-
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 56f9b484224..f7a90814cb2 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -4,10 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "ExtensionSystem"
- cpp.includePaths: [
- ".",
- ".."
- ]
cpp.defines: base.concat([
"EXTENSIONSYSTEM_LIBRARY",
"IDE_TEST_DIR=\".\""
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index edffdb4da59..0a49bc50db1 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -4,10 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "GLSL"
- cpp.includePaths: [
- ".",
- ".."
- ]
cpp.defines: base.concat([
"QT_CREATOR",
"GLSL_BUILD_LIB"
@@ -47,10 +43,5 @@ QtcLibrary {
"glsltypes.cpp",
"glsltypes.h",
]
-
- ProductModule {
- Depends { name: "cpp" }
- cpp.includePaths: ["."]
- }
}
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 0a4b2fc0619..811c4a96090 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -4,11 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "LanguageUtils"
- cpp.includePaths: [
- ".",
- "..",
- "../3rdparty/cplusplus"
- ]
+ cpp.includePaths: base.concat("../3rdparty/cplusplus")
cpp.defines: base.concat([
"QT_CREATOR",
"LANGUAGEUTILS_BUILD_DIR"
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index 5b6d5d21cff..6dbfd8d7768 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -4,10 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "QmlDebug"
- cpp.includePaths: [
- ".",
- ".."
- ]
cpp.defines: base.concat([
"QMLDEBUG_LIB"
])
@@ -46,10 +42,5 @@ QtcLibrary {
"qv8profilerclient.cpp",
"qv8profilerclient.h",
]
-
- ProductModule {
- Depends { name: "cpp" }
- cpp.includePaths: ["."]
- }
}
diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h
index cb2a8e2f3b3..27ba3925162 100644
--- a/src/libs/qmleditorwidgets/colorbox.h
+++ b/src/libs/qmleditorwidgets/colorbox.h
@@ -31,7 +31,7 @@
#ifndef COLORBOX_H
#define COLORBOX_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QWidget>
#include <qdeclarative.h>
diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h
index b3b57059c96..af1851dc194 100644
--- a/src/libs/qmleditorwidgets/colorbutton.h
+++ b/src/libs/qmleditorwidgets/colorbutton.h
@@ -31,7 +31,7 @@
#ifndef COLORBUTTON_H
#define COLORBUTTON_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QToolButton>
#include <qdeclarative.h>
diff --git a/src/libs/qmleditorwidgets/colorwidgets.h b/src/libs/qmleditorwidgets/colorwidgets.h
index bcbf00c8d5a..692b10f48ba 100644
--- a/src/libs/qmleditorwidgets/colorwidgets.h
+++ b/src/libs/qmleditorwidgets/colorwidgets.h
@@ -31,7 +31,7 @@
#ifndef COLORWIDGET_H
#define COLORWIDGET_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
namespace QmlEditorWidgets {
diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h
index c272222bce9..0a6bd562764 100644
--- a/src/libs/qmleditorwidgets/contextpanetextwidget.h
+++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h
@@ -31,7 +31,7 @@
#ifndef CONTEXTPANETEXTWIDGET_H
#define CONTEXTPANETEXTWIDGET_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QWidget>
QT_BEGIN_NAMESPACE
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h
index fd4328fdff8..15e61e840b4 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.h
+++ b/src/libs/qmleditorwidgets/contextpanewidget.h
@@ -31,7 +31,7 @@
#ifndef CONTEXTPANEWIDGET_H
#define CONTEXTPANEWIDGET_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QFrame>
#include <QPointer>
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
index 25911ef0a61..381e7c11481 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
@@ -31,8 +31,8 @@
#ifndef CONTEXTPANEWIDGETIMAGE_H
#define CONTEXTPANEWIDGETIMAGE_H
-#include <qmleditorwidgets_global.h>
-#include <contextpanewidget.h>
+#include "qmleditorwidgets_global.h"
+#include "contextpanewidget.h"
#include <qdrawutil.h>
#include <QLabel>
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
index e57f40d5b73..3b4162c0271 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h
@@ -31,7 +31,7 @@
#ifndef CONTEXTPANEWIDGETRECTANGLE_H
#define CONTEXTPANEWIDGETRECTANGLE_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QWidget>
QT_BEGIN_NAMESPACE
diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h
index 55ffcca3ab9..c3b5bd10b02 100644
--- a/src/libs/qmleditorwidgets/customcolordialog.h
+++ b/src/libs/qmleditorwidgets/customcolordialog.h
@@ -31,7 +31,7 @@
#ifndef CUSTOMCOLORDIALOG_H
#define CUSTOMCOLORDIALOG_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QFrame>
QT_BEGIN_NAMESPACE
diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h
index 819eb64dac1..c66e515459f 100644
--- a/src/libs/qmleditorwidgets/filewidget.h
+++ b/src/libs/qmleditorwidgets/filewidget.h
@@ -32,7 +32,7 @@
#ifndef FILEWIDGET_H
#define FILEWIDGET_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QWidget>
diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h
index 1ebb69d387d..ee6a71e9f84 100644
--- a/src/libs/qmleditorwidgets/fontsizespinbox.h
+++ b/src/libs/qmleditorwidgets/fontsizespinbox.h
@@ -31,7 +31,7 @@
#ifndef FONTSIZESPINBOX_H
#define FONTSIZESPINBOX_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QAbstractSpinBox>
namespace QmlEditorWidgets {
diff --git a/src/libs/qmleditorwidgets/gradientline.h b/src/libs/qmleditorwidgets/gradientline.h
index 7c98a5bc9ed..dd8621c9a7c 100644
--- a/src/libs/qmleditorwidgets/gradientline.h
+++ b/src/libs/qmleditorwidgets/gradientline.h
@@ -31,7 +31,7 @@
#ifndef GRADIENTLINE_H
#define GRADIENTLINE_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QWidget>
#include <QLinearGradient>
diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h
index b11f17eba19..637a3ce4f25 100644
--- a/src/libs/qmleditorwidgets/huecontrol.h
+++ b/src/libs/qmleditorwidgets/huecontrol.h
@@ -31,7 +31,7 @@
#ifndef HUECONTROL_H
#define HUECONTROL_H
-#include <qmleditorwidgets_global.h>
+#include "qmleditorwidgets_global.h"
#include <QWidget>
#include <qdeclarative.h>
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 09130aa9ccd..8f8e1808afb 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -4,11 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "QmlEditorWidgets"
- cpp.includePaths: [
- ".",
- "..",
- "easingpane"
- ]
+ cpp.includePaths: base.concat("easingpane")
cpp.defines: base.concat([
"QWEAKPOINTER_ENABLE_ARROW",
"BUILD_QMLEDITORWIDGETS_LIB",
@@ -59,10 +55,5 @@ QtcLibrary {
"easingpane/easinggraph.h",
"easingpane/easingpane.qrc",
]
-
- ProductModule {
- Depends { name: "cpp" }
- cpp.includePaths: ["."]
- }
}
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 5e5b1621385..6a4e8b0c21e 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -4,11 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "QmlJS"
- cpp.includePaths: [
- ".",
- "..",
- "parser"
- ]
+ cpp.includePaths: base.concat("parser")
cpp.defines: base.concat([
"QMLJS_BUILD_DIR",
"QT_CREATOR"
@@ -105,10 +101,6 @@ QtcLibrary {
ProductModule {
Depends { name: "cpp" }
Depends { name: "LanguageUtils" }
- cpp.includePaths: [
- ".",
- "parser"
- ]
cpp.defines: [
"QT_CREATOR"
]
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 116cf08a155..9b772cd9604 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -5,12 +5,6 @@ QtcLibrary {
name: "QtcSsh"
cpp.defines: base.concat(["QSSH_LIBRARY"])
- cpp.includePaths: [
- ".",
- "..",
- "../..",
- buildDirectory
- ]
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network" ] }
@@ -50,8 +44,6 @@ QtcLibrary {
]
ProductModule {
- Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network"] }
- cpp.includePaths: [".."]
}
}
diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp
index 90f48b1aa73..95b61b0b22f 100644
--- a/src/libs/utils/crumblepath.cpp
+++ b/src/libs/utils/crumblepath.cpp
@@ -29,6 +29,7 @@
**************************************************************************/
#include "crumblepath.h"
+#include "qtcassert.h"
#include "stylehelper.h"
#include <QList>
@@ -40,8 +41,6 @@
#include <QPainter>
#include <QImage>
-#include <qtcassert.h>
-
namespace Utils {
static const int ArrowBorderSize = 12;
diff --git a/src/libs/utils/filewizardpage.ui b/src/libs/utils/filewizardpage.ui
index 17b78cae6d1..e8b3ca1b4b9 100644
--- a/src/libs/utils/filewizardpage.ui
+++ b/src/libs/utils/filewizardpage.ui
@@ -45,7 +45,7 @@
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
- <header>pathchooser.h</header>
+ <header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index 835280fac59..ac3e71d8a4a 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -29,9 +29,8 @@
**************************************************************************/
#include "synchronousprocess.h"
-
+#include "qtcassert.h"
#include "hostosinfo.h"
-#include <qtcassert.h>
#include <QDebug>
#include <QTimer>
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 99eacdb1fbf..6d93ff3ba29 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -5,12 +5,6 @@ QtcLibrary {
name: "Utils"
cpp.defines: base.concat(["QTCREATOR_UTILS_LIB"])
- cpp.includePaths: [
- ".",
- "..",
- "../..",
- buildDirectory
- ]
Properties {
condition: qbs.targetOS == "windows"
@@ -213,9 +207,7 @@ QtcLibrary {
}
ProductModule {
- Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
- cpp.includePaths: [".."]
}
}
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index 83a32463c27..04274fd6f69 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -6,8 +6,8 @@ QtcLibrary {
Depends { name: "cpp" }
Depends { name: "Qt.network" }
+ cpp.includePaths: base.concat(".")
- cpp.includePaths: "."
cpp.defines: base.concat("ZEROCONF_LIBRARY")
Properties {
@@ -38,9 +38,4 @@ QtcLibrary {
"syssocket.h",
"zeroconf_global.h",
]
-
- ProductModule {
- Depends { name: "cpp" }
- cpp.includePaths: ["."]
- }
}
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 52203200232..b5f2154847c 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -33,6 +33,7 @@ Product {
if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
return ["-Wl,-s"]
}
+ cpp.includePaths: [ ".", ".." ]
Group {
files: [ name + ".pluginspec.in" ]
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index eb890351095..36a11871ed4 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -17,11 +17,6 @@ QtcPlugin {
"ANALYZER_LIBRARY",
"QT_NO_CAST_FROM_ASCII"
])
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"analyzerbase.qrc",
@@ -56,9 +51,6 @@ QtcPlugin {
]
ProductModule {
- Depends { name: "cpp" }
- cpp.includePaths: ["."]
-
Depends { name: "CPlusPlus" }
}
}
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 618d83a5c8e..bd2a2e83dda 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -15,12 +15,7 @@ QtcPlugin {
property bool enable: false
property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
- cpp.includePaths: [
- "..",
- buildDirectory,
- "../../libs",
- "../../shared"
- ]
+ cpp.includePaths: base.concat("../../shared")
files: [
"addnewavddialog.ui",
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index 00222dd2721..d5b9e0ebac1 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -13,12 +13,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"autogenstep.cpp",
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index d383da7cee5..b43ff69dd06 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"annotationhighlighter.cpp",
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index ad7aaf9c3a6..638c13fb1df 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -11,11 +11,6 @@ QtcPlugin {
Depends { name: "Find" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"bineditor.cpp",
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index d1c0863f885..c7d02f9e7da 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"bookmark.cpp",
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index 65052fb16c5..338cec83eb1 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"classview.qrc",
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 2a3776d6d13..18a15de51a6 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -18,12 +18,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"activityselector.cpp",
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 4a55c77dbe2..3ce75fbbcb6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -14,14 +14,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "QtSupport" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"CMakeProject.mimetypes.xml",
"cmakebuildconfiguration.cpp",
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 614f35e23c6..83e33280542 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -15,18 +15,15 @@ QtcPlugin {
Depends { name: "Aggregation" }
Depends { name: "app_version_header" }
- cpp.includePaths: [
- ".",
- "..",
+ cpp.includePaths: base.concat([
"../..",
- "../../libs",
- "../../../src/shared/scriptwrapper/",
+ "../../shared/scriptwrapper",
"dialogs",
"editormanager",
"progressmanager",
"scriptmanager",
"actionmanager"
- ]
+ ])
cpp.dynamicLibraries: {
if (qbs.targetOS == "windows") return [
@@ -257,11 +254,5 @@ QtcPlugin {
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
Depends { name: "Utils" }
- cpp.includePaths: [
- "../..",
- "../../libs",
- product.buildDirectory + "/.obj/Core/actionmanager"
- ]
}
}
-
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h
index cfda66eda62..c06c4ebc598 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -31,7 +31,7 @@
#ifndef INAVIGATIONWIDGET_H
#define INAVIGATIONWIDGET_H
-#include <coreplugin/id.h>
+#include "id.h"
#include <QObject>
#include <QList>
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 9e30f93c504..61bd22af9a7 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -30,8 +30,8 @@
#include "progressmanager_p.h"
#include "progressview.h"
-#include "coreconstants.h"
-#include "icore.h"
+#include "../coreconstants.h"
+#include "../icore.h"
#include <utils/qtcassert.h>
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index a906d6cceaa..14cf63b416f 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -10,13 +10,7 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
- "../../shared/cpaster",
- "..",
- "../../libs",
- buildDirectory
- ]
+ cpp.includePaths: base.concat("../../shared/cpaster")
files: [
"codepasterprotocol.cpp",
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 9c86f15f352..8cd892a574f 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -12,12 +12,8 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- "../../libs/3rdparty",
- buildDirectory
- ]
+
+ cpp.includePaths: base.concat("../../libs/3rdparty")
files: [
"CppEditor.mimetypes.xml",
@@ -62,4 +58,3 @@ QtcPlugin {
"cpptypehierarchy.h",
]
}
-
diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h
index 805945f7e85..8a50a3d8873 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.h
+++ b/src/plugins/cpptools/cppfunctionsfilter.h
@@ -31,7 +31,7 @@
#ifndef CPPFUNCTIONSFILTER_H
#define CPPFUNCTIONSFILTER_H
-#include <cpplocatorfilter.h>
+#include "cpplocatorfilter.h"
namespace CppTools {
namespace Internal {
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 5de56fa4443..3a2ba29005f 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -17,12 +17,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII"])
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"ModelManagerInterface.cpp",
@@ -117,4 +111,3 @@ QtcPlugin {
Depends { name: "CPlusPlus" }
}
}
-
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 1067321d7f2..d89725f59d8 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" }
Depends { name: "Locator" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"annotationhighlighter.cpp",
"annotationhighlighter.h",
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 74236e39481..08b64d69cbe 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -20,17 +20,12 @@ QtcPlugin {
Depends { name: "QtcSsh" }
Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
+ cpp.includePaths: base.concat([
"shared",
"lldb",
- "..",
- "../../libs",
"../../shared/json",
- buildDirectory,
- "../../libs/utils",
- "../../shared/registryaccess/"
- ]
+ "../../shared/registryaccess"
+ ])
Group {
condition: Defaults.testsEnabled(qbs)
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 8c793f586f7..f30940b7316 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -14,15 +14,11 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["CPP_ENABLED"])
- cpp.includePaths: [
+ cpp.includePaths: base.concat([
"../../libs/3rdparty",
"cpp",
- "../../shared/designerintegrationv2",
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
+ "../../shared/designerintegrationv2"
+ ])
files: [
"Designer.mimetypes.xml",
@@ -88,4 +84,3 @@ QtcPlugin {
"cpp/formclasswizardparameters.h",
]
}
-
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index ed44480700c..218897eb2e6 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -9,15 +9,8 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
- Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"fakevimactions.cpp",
"fakevimactions.h",
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 8cc6d8ecf07..56e3eab12a2 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -9,16 +9,12 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
- "..",
+ cpp.includePaths: base.concat([
"generichighlighter",
"tooltip",
"snippets",
- "codeassist",
- "../../libs",
- buildDirectory
- ]
+ "codeassist"
+ ])
files: [
"basetextfind.cpp",
@@ -57,4 +53,3 @@ QtcPlugin {
"treeviewfind.h",
]
}
-
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 866e88c9cf7..8a47a547cbc 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -15,13 +15,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "QtSupport" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"filesselectionwizardpage.cpp",
"filesselectionwizardpage.h",
@@ -50,4 +43,3 @@ QtcPlugin {
"selectablefilesmodel.h",
]
}
-
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index e935869d76c..f852fd98d04 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -34,10 +34,10 @@
#include "gerritmodel.h"
#include "gerritoptionspage.h"
-#include <gitplugin.h>
-#include <gitclient.h>
-#include <gitversioncontrol.h>
-#include <gitconstants.h>
+#include "../gitplugin.h"
+#include "../gitclient.h"
+#include "../gitversioncontrol.h"
+#include "../gitconstants.h"
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsbaseeditor.h>
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 4e2e7fb3bbe..e11a830c964 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -14,14 +14,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
- cpp.includePaths: [
- ".",
- "gitorious",
- "gerrit",
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"annotationhighlighter.cpp",
@@ -117,4 +109,3 @@ QtcPlugin {
]
}
}
-
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
index 77296a1f3a2..ebe207274b6 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
@@ -32,9 +32,9 @@
#include "gitorioushostwizardpage.h"
#include "gitoriousprojectwizardpage.h"
#include "gitoriousrepositorywizardpage.h"
-#include "clonewizardpage.h"
-#include <git/gitplugin.h>
+#include "../clonewizardpage.h"
+#include "../gitplugin.h"
#include <coreplugin/iversioncontrol.h>
#include <vcsbase/checkoutjobs.h>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 6647b5a1a78..0d396c35ae5 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -40,12 +40,12 @@
#include "branchdialog.h"
#include "remotedialog.h"
#include "clonewizard.h"
-#include "gitoriousclonewizard.h"
+#include "gitorious/gitoriousclonewizard.h"
#include "stashdialog.h"
#include "settingspage.h"
#include "resetdialog.h"
-#include <gerritplugin.h>
+#include "gerrit/gerritplugin.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 732220ad840..66272773149 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -13,14 +13,6 @@ QtcPlugin {
Depends { name: "GLSL" }
Depends { name: "CPlusPlus" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "../..",
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"GLSLEditor.mimetypes.xml",
"glslautocompleter.cpp",
@@ -52,4 +44,3 @@ QtcPlugin {
"reuse.h",
]
}
-
diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs
index d1beb7d1a21..e5546e282aa 100644
--- a/src/plugins/helloworld/helloworld.qbs
+++ b/src/plugins/helloworld/helloworld.qbs
@@ -6,15 +6,8 @@ QtcPlugin {
name: "HelloWorld"
Depends { name: "Core" }
- Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"helloworldplugin.cpp",
"helloworldplugin.h",
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 7af96d862e8..53dd30c2cdc 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -26,13 +26,7 @@ QtcPlugin {
cpp.defines: base.concat(["QT_NO_WEBKIT"])
}
cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
- cpp.includePaths: [
- "../../shared/help",
- ".",
- "..",
- "../..",
- "../../libs"
- ]
+ cpp.includePaths: base.concat("../../shared/help")
files: [
"centralwidget.cpp",
@@ -96,4 +90,3 @@ QtcPlugin {
"../../shared/help/topicchooser.ui",
]
}
-
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 6029976044b..79e5528baa4 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -8,14 +8,6 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "svg"] }
Depends { name: "Core" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"ImageViewer.mimetypes.xml",
"imageview.cpp",
@@ -35,4 +27,3 @@ QtcPlugin {
"imageviewertoolbar.ui",
]
}
-
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index e93438998a4..af809cfd841 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -9,16 +9,12 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
- "..",
+ cpp.includePaths: base.concat([
"generichighlighter",
"tooltip",
"snippets",
- "codeassist",
- "../../libs",
- buildDirectory
- ]
+ "codeassist"
+ ])
files: [
"basefilefilter.cpp",
@@ -55,4 +51,3 @@ QtcPlugin {
"images/reload.png",
]
}
-
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 15abb6e07f3..c30877a7cca 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "app_version_header" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- "../.."
- ]
-
files: [
"actionmacrohandler.cpp",
"actionmacrohandler.h",
@@ -53,4 +46,3 @@ QtcPlugin {
"texteditormacrohandler.h",
]
}
-
diff --git a/src/plugins/madde/madde.qbs b/src/plugins/madde/madde.qbs
index 8f84d46de99..86adadbf5e9 100644
--- a/src/plugins/madde/madde.qbs
+++ b/src/plugins/madde/madde.qbs
@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "Qt.gui" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
cpp.defines: base.concat(['QT_NO_CAST_TO_ASCII'])
files: [
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 518d50bc1ea..fcf9752e5fd 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" }
Depends { name: "Locator" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"annotationhighlighter.cpp",
"annotationhighlighter.h",
@@ -54,4 +47,3 @@ QtcPlugin {
"srcdestdialog.ui",
]
}
-
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index ddf831b359e..ee31c909594 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" }
Depends { name: "Locator" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"annotationhighlighter.cpp",
"annotationhighlighter.h",
@@ -50,4 +43,3 @@ QtcPlugin {
"submitpanel.ui",
]
}
-
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index 83980e61334..55a924cbdf7 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -29,13 +29,13 @@
**************************************************************************/
#include "applicationlauncher.h"
-#include "consoleprocess.h"
#ifdef Q_OS_WIN
#include "windebuginterface.h"
#endif
#include <coreplugin/icore.h>
+#include <utils/consoleprocess.h>
#include <utils/qtcprocess.h>
#ifdef Q_OS_WIN
#include <utils/winutils.h>
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index 511a56893cf..b25ae12bbd6 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -33,7 +33,8 @@
#include "ui_processstep.h"
#include "abstractprocessstep.h"
-#include "environment.h"
+
+#include <utils/environment.h>
namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index b00c48ba2f8..8eb13f4812f 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -33,7 +33,6 @@
#include "buildconfiguration.h"
#include "deployconfiguration.h"
#include "editorconfiguration.h"
-#include "environment.h"
#include "projectexplorer.h"
#include "projectexplorerconstants.h"
#include "projectnodes.h"
@@ -49,6 +48,7 @@
#include <projectexplorer/kitmanager.h>
#include <limits>
#include <utils/qtcassert.h>
+#include <utils/environment.h>
/*!
\class ProjectExplorer::Project
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 84b8e16062d..d5a1127af4c 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,4 +1,5 @@
import qbs.base 1.0
+
import "../QtcPlugin.qbs" as QtcPlugin
import "../../../qbs/defaults.js" as Defaults
@@ -14,15 +15,10 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QTC_CPU=X86Architecture"])
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- "../../libs/utils",
+ cpp.includePaths: base.concat([
"customwizard",
- "publishing",
- buildDirectory
- ]
+ "publishing"
+ ])
files: [
"abi.cpp",
@@ -342,8 +338,6 @@ QtcPlugin {
}
ProductModule {
- Depends { name: "cpp" }
- Depends { name: "Qt"; submodules: ["network"] }
- cpp.includePaths: [".."]
+ Depends { name: "Qt.network" }
}
}
diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs
index 138d83abc34..b59049546bc 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -21,8 +21,7 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"])
- cpp.includePaths: [
- ".",
+ cpp.includePaths: base.concat([
"designercore",
"designercore/include",
"../../../share/qtcreator/qml/qmlpuppet/interfaces",
@@ -35,11 +34,8 @@ QtcPlugin {
"components/itemlibrary",
"components/navigator",
"components/pluginmanager",
- "components/stateseditor",
- "..",
- "../../libs",
- buildDirectory
- ]
+ "components/stateseditor"
+ ])
Group {
prefix: "designercore/filemanager/"
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index fc5afc23229..9e81ca3ca30 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -18,12 +18,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_CREATOR"])
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"QmlJSEditor.mimetypes.xml",
@@ -98,4 +92,3 @@ QtcPlugin {
Depends { name: "QmlJSTools" }
}
}
-
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp
index e8ee5c8c6f1..94dea0444e4 100644
--- a/src/plugins/qmljseditor/quicktoolbar.cpp
+++ b/src/plugins/qmljseditor/quicktoolbar.cpp
@@ -29,10 +29,11 @@
**************************************************************************/
#include "quicktoolbar.h"
-#include <contextpanewidget.h>
-#include <quicktoolbarsettingspage.h>
+#include "quicktoolbarsettingspage.h"
#include <utils/changeset.h>
+#include <qmleditorwidgets/contextpanewidget.h>
+#include <qmleditorwidgets/customcolordialog.h>
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljspropertyreader.h>
@@ -46,7 +47,6 @@
#include <texteditor/basetexteditor.h>
#include <texteditor/tabsettings.h>
#include <coreplugin/icore.h>
-#include <customcolordialog.h>
#include <QDebug>
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 2aea7349c07..079f804d7e8 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -19,12 +19,7 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII"])
- cpp.includePaths: [
- "..",
- "../../libs",
- "../../libs/3rdparty",
- buildDirectory
- ]
+ cpp.includePaths: base.concat("../../libs/3rdparty")
files: [
"qmljscodestylepreferencesfactory.cpp",
@@ -70,4 +65,3 @@ QtcPlugin {
Depends { name: "QmlDebug" }
}
}
-
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index ef22fbf627d..24996f068c4 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -20,12 +20,7 @@ QtcPlugin {
Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "canvas",
- "..",
- "../../libs",
- buildDirectory
- ]
+ cpp.includePaths: base.concat("canvas")
files: [
"abstractqmlprofilerrunner.h",
@@ -87,4 +82,3 @@ QtcPlugin {
"qml/qmlprofiler.qrc",
]
}
-
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 7d7879a487b..9b453b8363d 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -15,12 +15,6 @@ QtcPlugin {
Depends { name: "QtSupport" }
Depends { name: "app_version_header" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs"
- ]
-
files: [
"QmlProject.mimetypes.xml",
"qmlproject.cpp",
@@ -55,4 +49,3 @@ QtcPlugin {
"fileformat/qmlprojectitem.h",
]
}
-
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index b47e960b5ce..ff11e279aa0 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -18,12 +18,7 @@ QtcPlugin {
property var pluginspecreplacements: ({"QNX_EXPERIMENTAL_STR": (enable ? "false" : "true")})
cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII", "QT_NO_CAST_FROM_ASCII"])
- cpp.includePaths: [
- "..",
- buildDirectory,
- "../../libs",
- "../../shared"
- ]
+ cpp.includePaths: base.concat("../../shared")
files: [
"bardescriptorfileimagewizardpage.cpp",
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index d21b19838fa..271bd76850c 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -29,7 +29,7 @@
**************************************************************************/
#include "desktopqtversion.h"
-#include "qt4projectmanagerconstants.h"
+#include "../qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
index 29e7e75afde..9094862d183 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
@@ -28,8 +28,8 @@
**
**************************************************************************/
#include "desktopqtversionfactory.h"
-#include "qt4projectmanagerconstants.h"
#include "desktopqtversion.h"
+#include "../qt4projectmanagerconstants.h"
#include <qtsupport/qtversionmanager.h>
#include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index ea09317c8a9..32f5515e349 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -30,12 +30,12 @@
#include "qt4runconfiguration.h"
-#include "makestep.h"
-#include "qt4nodes.h"
-#include "qt4project.h"
-#include "qt4buildconfiguration.h"
-#include "qt4projectmanagerconstants.h"
-#include "qmakestep.h"
+#include "../makestep.h"
+#include "../qt4nodes.h"
+#include "../qt4project.h"
+#include "../qt4buildconfiguration.h"
+#include "../qt4projectmanagerconstants.h"
+#include "../qmakestep.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index bec27ebe296..2a7584399fb 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -17,22 +17,16 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "cpp" }
- cpp.defines: {
- return base.concat([
- "PROPARSER_AS_LIBRARY",
- "PROPARSER_THREAD_SAFE",
- "PROEVALUATOR_THREAD_SAFE",
- "PROEVALUATOR_CUMULATIVE"
- ])
- }
- cpp.includePaths: [
- ".",
- "..",
- buildDirectory,
+ cpp.defines: base.concat([
+ "PROPARSER_AS_LIBRARY",
+ "PROPARSER_THREAD_SAFE",
+ "PROEVALUATOR_THREAD_SAFE",
+ "PROEVALUATOR_CUMULATIVE"
+ ])
+ cpp.includePaths: base.concat([
"customwidgetwizard",
- "../../libs",
"../../shared",
- ]
+ ])
files: [
"Qt4ProjectManager.mimetypes.xml",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 3cbac807c77..5532bc253e6 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -12,14 +12,10 @@ QtcPlugin {
Depends { name: "QmlJS" }
Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
+ cpp.includePaths: base.concat([
"../../shared",
- "../../shared/proparser",
- "..",
- "../../libs",
- buildDirectory
- ]
+ "../../shared/proparser"
+ ])
cpp.defines: base.concat([
"QT_NO_CAST_FROM_ASCII",
@@ -108,7 +104,7 @@ QtcPlugin {
ProductModule {
Depends { name: "cpp" }
- cpp.includePaths: [ "../../shared" ]
+ cpp.includePaths: "../../shared"
cpp.defines: [
"QMAKE_AS_LIBRARY",
"PROEVALUATOR_THREAD_SAFE",
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index c5dda762fc5..8246f6b39dd 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "QtSupport" }
Depends { name: "QtcSsh" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"abstractpackagingstep.cpp",
"abstractpackagingstep.h",
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 9f51b8b0864..889bd951f29 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -10,14 +10,7 @@ QtcPlugin {
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "xml"] }
- cpp.includePaths: [
- "..",
- "../..",
- "../../libs",
- buildDirectory,
- "qrceditor",
- "../../tools/utils"
- ]
+ cpp.includePaths: base.concat("qrceditor")
files: [
"ResourceEditor.mimetypes.xml",
@@ -42,4 +35,3 @@ QtcPlugin {
"qrceditor/undocommands_p.h",
]
}
-
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index d4769f818b0..ed5571e47c0 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" }
Depends { name: "Locator" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"annotationhighlighter.cpp",
"annotationhighlighter.h",
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index 9f0a56620d2..9a92e0493e3 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "TextEditor" }
- Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"TaskList.mimetypes.xml",
"stopmonitoringhandler.cpp",
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h
index 29e3428b8ee..9a941f15349 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.h
+++ b/src/plugins/texteditor/generichighlighter/highlighter.h
@@ -31,8 +31,8 @@
#ifndef HIGHLIGHTER_H
#define HIGHLIGHTER_H
-#include "basetextdocumentlayout.h"
-#include "syntaxhighlighter.h"
+#include "../basetextdocumentlayout.h"
+#include "../syntaxhighlighter.h"
#include <QString>
#include <QVector>
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
index de97f7a7a1e..7d81b939f75 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h
@@ -31,7 +31,7 @@
#ifndef HIGHLIGHTERSETTINGSPAGE_H
#define HIGHLIGHTERSETTINGSPAGE_H
-#include "texteditoroptionspage.h"
+#include "../texteditoroptionspage.h"
QT_BEGIN_NAMESPACE
template <class> class QList;
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.h b/src/plugins/texteditor/snippets/snippetssettingspage.h
index d04157d7f65..f8802285992 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.h
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.h
@@ -31,7 +31,7 @@
#ifndef SNIPPETSSETTINGSPAGE_H
#define SNIPPETSSETTINGSPAGE_H
-#include "texteditoroptionspage.h"
+#include "../texteditoroptionspage.h"
namespace TextEditor {
namespace Internal {
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index aa98ab169fc..3eaa4bb1948 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -11,16 +11,12 @@ QtcPlugin {
Depends { name: "Find" }
Depends { name: "Locator" }
- cpp.includePaths: [
- ".",
- "..",
+ cpp.includePaths: base.concat([
"generichighlighter",
"tooltip",
"snippets",
- "codeassist",
- "../../libs",
- buildDirectory
- ]
+ "codeassist"
+ ])
files: [
"TextEditor.mimetypes.xml",
@@ -290,4 +286,3 @@ QtcPlugin {
Depends { name: "Locator" }
}
}
-
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index eb9c48f419b..85d218de15b 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -15,11 +15,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
- cpp.includePaths: [
- "..",
- "../../libs",
- buildDirectory
- ]
files: [
"constants.h",
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index e615e9816f3..868c6d02bb1 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -29,12 +29,11 @@
**************************************************************************/
#include "callgrindcontroller.h"
+#include "../valgrindprocess.h"
#include <QDebug>
#include <QDir>
-#include <valgrindprocess.h>
-
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <ssh/sftpchannel.h>
diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.h b/src/plugins/valgrind/callgrind/callgrindrunner.h
index fce86535511..5c6a64fb7aa 100644
--- a/src/plugins/valgrind/callgrind/callgrindrunner.h
+++ b/src/plugins/valgrind/callgrind/callgrindrunner.h
@@ -31,7 +31,7 @@
#ifndef VALGRIND_CALLGRIND_CALLGRINDRUNNER_H
#define VALGRIND_CALLGRIND_CALLGRINDRUNNER_H
-#include <valgrindrunner.h>
+#include "../valgrindrunner.h"
#include "callgrindcontroller.h"
diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp
index 7867ff7bcef..83feffab977 100644
--- a/src/plugins/valgrind/memcheck/memcheckrunner.cpp
+++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp
@@ -32,9 +32,9 @@
#include "memcheckrunner.h"
-#include <xmlprotocol/error.h>
-#include <xmlprotocol/status.h>
-#include <xmlprotocol/threadedparser.h>
+#include "../xmlprotocol/error.h"
+#include "../xmlprotocol/status.h"
+#include "../xmlprotocol/threadedparser.h"
#include <utils/qtcassert.h>
diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.h b/src/plugins/valgrind/memcheck/memcheckrunner.h
index 03ba4b5fb50..4fa63cefe7c 100644
--- a/src/plugins/valgrind/memcheck/memcheckrunner.h
+++ b/src/plugins/valgrind/memcheck/memcheckrunner.h
@@ -33,7 +33,7 @@
#ifndef VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
#define VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
-#include <valgrindrunner.h>
+#include "../valgrindrunner.h"
namespace Valgrind {
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index d6cb6833724..e3add86457b 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -13,15 +13,6 @@ QtcPlugin {
Depends { name: "RemoteLinux" }
Depends { name: "CPlusPlus"}
- Depends { name: "cpp" }
- cpp.includePaths: [
- ".",
- "valgrind",
- "..",
- "../../libs",
- buildDirectory
- ]
-
files: [
"callgrindcostdelegate.cpp",
"callgrindcostdelegate.h",
@@ -118,4 +109,3 @@ QtcPlugin {
"xmlprotocol/threadedparser.h",
]
}
-
diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp
index f890c9a8a39..86427b1f17d 100644
--- a/src/plugins/vcsbase/checkoutjobs.cpp
+++ b/src/plugins/vcsbase/checkoutjobs.cpp
@@ -30,8 +30,8 @@
#include "checkoutjobs.h"
-#include <vcsbaseplugin.h>
-#include <vcsbaseoutputwindow.h>
+#include "vcsbaseplugin.h"
+#include "vcsbaseoutputwindow.h"
#include <QDebug>
#include <QQueue>
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 68ee417077c..aefb0c04f90 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -14,14 +14,6 @@ QtcPlugin {
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
- cpp.includePaths: [
- ".",
- "..",
- "../../libs",
- "../../libs/3rdparty",
- buildDirectory
- ]
-
files: [
"VcsBase.mimetypes.xml",
"baseannotationhighlighter.cpp",
@@ -90,4 +82,3 @@ QtcPlugin {
"images/submit.png",
]
}
-
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 01c277c1680..3f4182aedf9 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -10,13 +10,7 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
- cpp.includePaths: [
- "..",
- "../../libs",
- "../../../src/shared/scriptwrapper",
- "../../Core/dynamiclibrary",
- buildDirectory
- ]
+ cpp.includePaths: base.concat("../../shared/scriptwrapper")
files: [
"welcome_global.h",
@@ -24,4 +18,3 @@ QtcPlugin {
"welcomeplugin.h",
]
}
-
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index 6a2f12803e0..7d8e571a909 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -4,15 +4,15 @@ import "../QtcTool.qbs" as QtcTool
QtcTool {
name: "sdktool"
- cpp.includePaths: [buildDirectory]
- cpp.defines: base.concat([qbs.targetOS === "mac"
- ? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"'])
-
Depends { name: "cpp" }
Depends { name: "Qt.core" }
Depends { name: "Utils" }
Depends { name: "app_version_header" }
+ cpp.includePaths: "../../libs"
+ cpp.defines: base.concat([qbs.targetOS === "mac"
+ ? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"'])
+
files: [
"addkeysoperation.cpp",
"addkeysoperation.h",
--
GitLab