diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index ee8afc1d0337d8f6e9fb814cbe494a4f3846e563..3743e8d27abecf90e2ce529b37d44fdf9fc53408 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 85ba60ab89c2280aa248f18c322ee1a4a9a71890..3e97e4a59d21c7f93c1f2b0cff334fcf6c37741a 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 5b64ea423fadac08fe5176ae20b5fb1e15b410d2..a5e8e84d396ac5879754fb179857df4e12086f9d 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 7b9e98d04ac80dfe5c7157ef398bf0fdaf43901b..db321ded65783d3f3a53c9db02f5e662a04bb107 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 56f9b48422414bea1a28feb67b08542a881d11a9..f7a90814cb2ec0f8fd4909acd2931db4b48e14d6 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 edffdb4da59f0e3e074f703e5da40f6e595a9f96..0a49bc50db1375de62c4bb8381f7fdd8bbd790d3 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 0a4b2fc061952d4a358455cc9a95108e1f92a163..811c4a960903f04fdb9b2b6c6ca46de638919125 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 5b6d5d21cffb404f9ec9f913b7bda757dd00c528..6dbfd8d7768768b3b95ba878b4828cb5b8e675de 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 cb2a8e2f3b34f2cf8e0cb4ba8cdf6bc41498404e..27ba392516223e5f6898a83d80a75d1e42f71cc4 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 b3b57059c9692684552e35677976ec28759ee854..af1851dc19463310ffa1f65a4579acc11bcfd76b 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 bcbf00c8d5a63ee62cf0cdc10b8a6d1e0354905e..692b10f48ba6ab6352653d85e9ea6ad4f8fe708b 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 c272222bce9270267497cac2d3e3f812a9f012a6..0a6bd562764a2ab65326aa0368f26376d124a9e9 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 fd4328fdff8adccbea9f5ee8ec4a2052c6f67697..15e61e840b4db4c14313b037ae737e602fad9937 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 25911ef0a6184cc9380405540c79ed3a385c9390..381e7c114813718a681aded69f18b76925e8e63e 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 e57f40d5b737f3e40bd3ddb1707fac7e60516a50..3b4162c027113a629b224dab32f07d427f2f0b3d 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 55ffcca3ab9e4e01e4a0e59951642784fe9ec2e8..c3b5bd10b02ddbf1b623810598a9dc88fa7f73f7 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 819eb64dac1d66b7e3deb7f17aa985b30ee830ca..c66e515459f826bc2005189a9b501ab9a4ffb8f8 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 1ebb69d387d07a1c80853060f221b1bf00fb10b8..ee6a71e9f845e82c292c698fc324ddddac6ebbf8 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 7c98a5bc9ed2f37d65ea6903c17c1a15385e9c92..dd8621c9a7c1630b49946a4b5b21a484c4e838b0 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 b11f17eba1903ee1f65bf907b76b2f70e2e5f26e..637a3ce4f252993e9bcbc5ee9ec0f31fd81ac82f 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 09130aa9ccd8727f369e8d4517ee8553d1149a24..8f8e1808afb7cd9c81d898c0e7931d44380a88a7 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 5e5b162138541bc58166316ad75d269ff5ad11aa..6a4e8b0c21e9a2a258a10e38413a41fed6ded863 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 116cf08a1555f3d941ad2bd1498980935e60ed6b..9b772cd9604ae85e4a57235312c75bf3dfc215b6 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 90f48b1aa73184aaaece14138f6a3bd884be5dfc..95b61b0b22f41d5d1de764eb0027abf76616f327 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 17b78cae6d19e8dc7071315726a265006d43b0a8..e8b3ca1b4b9eb129be0a723dadc7baefc9a2ef3f 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 835280fac5994fefdfa2368528eafca7a1590549..ac3e71d8a4aef56734ee237bd87dee35d6f52579 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 99eacdb1fbf4dfaee1a7dd00eb1cf9a6bc0cb711..6d93ff3ba29be56fc17a20642509d4307602877e 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 83a32463c27278b55548f103d180b368c420333f..04274fd6f69d600922d8d71e1ac6de9b948c9aa2 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 5220320023286344fefcef165cd291fff8489d9f..b5f2154847c95f4e0181cf496b0014613a9d1630 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 eb89035109526d5cb26589e8c437101d99b9e5a6..36a11871ed4046787dc871ec08101551263dff5a 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 618d83a5c8e393e54550402f56c183366e253efe..bd2a2e83dda303ae7646f8576b0f3cc2691dd1ca 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 00222dd2721292e93724f38079775c11808465c5..d5b9e0ebac1a894a3c4db24f24651f99b13b4796 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 d383da7cee5d58e4bac8f1a70f3e558c665c6155..b43ff69dd06c7dbb83bbfc4f2267d8f5a80d6ef8 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 ad7aaf9c3a6584642ba40e552c2c110d8df78bfe..638c13fb1dfea294df115c736d673221a95d0d32 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 d1c0863f88580f347084eec551b38aa96426cb27..c7d02f9e7daf39ccd72d61b70550599051fd0022 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 65052fb16c55faf09e291f0bd13ebc8af69b383b..338cec83eb1fda8a0c46cc412b8553a22792e9d1 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 2a3776d6d1328b0b9ac4c8899f594e9fe9c2fc63..18a15de51a68f24b1d955144379111a617f0e71f 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 4a55c77dbe29852fc838b04d165329be7a7e8d4b..3ce75fbbcb60bdbd65a7e20086fd3f8f95033b63 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 614f35e23c691a4fdeba62aea62d032fe8079174..83e33280542bcd93012111be6a1a81036e3f5093 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 cfda66eda6270e88f1b221a6687ec05a13472290..c06c4ebc598512986afb06a745625decf898cb2b 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 9e30f93c5049e93962950b6767a2b46e56dc4b1f..61bd22af9a7ecfa823c198723b47babc69c3de4f 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 a906d6cceaaa9e5f48dd563ea0744b318697f4d3..14cf63b416f308f3b426e8c1ff5d10674b191da2 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 9c86f15f35231de1af2c02c812268b4da73997fa..8cd892a574f1d7edd2f6b6adc92786161b68ea60 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 805945f7e855554d4ea9ad02424c8e998a88d28d..8a50a3d8873a8a8feb39b1071dd19e5d565b0eb6 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 5de56fa4443e3f2e63462a94e19eb74b6cd75345..3a2ba29005fe633553771409aa03799a4a501407 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 1067321d7f20f35f4fd38caa70971a2554ba74db..d89725f59d82865995ce781d36e129766667c246 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 74236e39481b560842f6aa1614803f458e5ba536..08b64d69cbec5c936de044bdf3d31a95677a59f5 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 8c793f586f78c5e59f630cf8ecf29c4d1d30bc3f..f30940b7316b2dd65a4ddcd3f50e245844696c35 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 ed44480700c683c7b45f3707ea31d7d15aee6774..218897eb2e657ef74daf2f4f1afdb5b33bfb6690 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 8cc6d8ecf0733dbf52a820185ed22b2c2f07902b..56e3eab12a295c92d33d3d6d3398c8728aa6a009 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 866e88c9cf7934932186446f1281cacce4cc0be7..8a47a547cbc667595a298cae158219e95272d9b9 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 e935869d76c41895cd52b78c3808ac269c24f6b2..f852fd98d0453147a2f272dda0b13e5c34c971a4 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 4e2e7fb3bbe02bb5ff95d5619fa980b714d9a063..e11a830c964ced94df126d5dbb30a0d50cbd151c 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 77296a1f3a2208e952086d1bbe618b0b589b14dc..ebe207274b64dcb67652c3c3dd6e55a590f901e6 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 6647b5a1a78e37af0a934d2f8e20e2bb4e86b725..0d396c35ae56ef43fdb179142e16f375e4f22bb2 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 732220ad840a59263c154823ffad5db6271600e8..662727731493d5e87b59868289169fb7b3b2b645 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 d1beb7d1a2169f30eefa5055b162707c9c0b3953..e5546e282aa1c31b7ebf2fde6ff682c2b537f581 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 7af96d862e81b44004edacec5f977eb04138b693..53dd30c2cdcd70eaa53560663f795936262a2dcd 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 6029976044bea337e6f7d009eb00bde8ecb66272..79e5528baa431267ad06f039a17fc1911741239a 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 e93438998a44c35522c8dd47cabab6a6a0c376e9..af809cfd841e330c85b7e94c9a2ad78bced6a6f9 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 15abb6e07f3063986eb5a0b705bacd1f5adfd629..c30877a7ccad1ca9a917acd2e32336a37ab3a657 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 8f84d46de99c150a27417bc69f546ec388a961fd..86adadbf5e996ce977f27ef1cfc65da863408e07 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 518d50bc1eaad4165c152659f96fe9b75b41ec28..fcf9752e5fd18a0a8915f499d4eae2fa0d5173ca 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 ddf831b359e793b4b66af591f479d5f2b78f0623..ee31c909594f5508a72712972267916915cb3b36 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 83980e6133485bdc5ef2770581e973880c46d73a..55a924cbdf77287099157f6bb4f5e53201f5f0a1 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 511a56893cf6a02d2f7aa1339cc564a5adeebf80..b25ae12bbd60ef051e722ae2911049927444652c 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 b00c48ba2f80f3876e5160081f9ebcf5359cd536..8eb13f4812fa2b8969e8c717e842fe44fce91f55 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 84b8e16062d230b4ceb1e1f85be755d6e6d92acf..d5a1127af4cdb5166fb7093db2f1e4cb0b79f3f2 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 138d83abc341e3631aa26bfff39a8c9aa32b73f2..b59049546bcf64852201fefe61048a541f464481 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 fc5afc2322917bd4c81fb345baa2873c3f907cf8..9e81ca3ca304fe9db3aa95dde38024684db96afb 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 e8ee5c8c6f16ff97d899e7f8d0cd5c4b1f14d51a..94dea0444e43fda769e68d9e3f5648b971ce9273 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 2aea7349c0732a5f629d92e6922da46c4f5292c7..079f804d7e8cd193fa40ab14081987e9bf6663b9 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 ef22fbf627d83a89109ab1e589f8a9ccf4146383..24996f068c4d80e9ae02275a04c94c419daeb792 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 7d7879a487b407d1dcd89c09864ce547e02ee1fb..9b453b8363d17567e6c86013127079daa51030c0 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 b47e960b5ce54426a5c800b7ca0cf27c69f811c7..ff11e279aa0b96295c563ad5d64e8aefa7a7f1ff 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 d21b19838fa75729b5e3e98144f9693adc0c5efc..271bd76850c06422b12da2a9987afad6e99e2087 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 29e7e75afdeb043502b716da3e7194f2ebc4747b..9094862d18358977af55f8cbf47944331df963cc 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 ea09317c8a9758ae9df68457633caf0e38d8c384..32f5515e349ec8061cffb287014ddcc322c501a9 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 bec27ebe296b99cfbe7e111f2b4176c75f39bbda..2a7584399fbd0afd21b9421b3ab8bbe99ee3b69b 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 3cbac807c77be4c1df02de6d6650dd88a147bbaf..5532bc253e6cd8627725a7aac4bee28aaff60132 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 c5dda762fc574ddae494b7aa07a1371b7c84af2b..8246f6b39dd8a7ec878c2cae35db02ba41bda99f 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 9f51b8b086476d5ba4e4e35dd3e4949b3b5ceb4e..889bd951f29be19c8cb56e73d347089d8a12e3ef 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 d4769f818b04a8a3b7efbabecca1c18efb4139db..ed5571e47c01b1f4b8201410d4d1f18e5278ba3e 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 9f0a56620d2f939b7e673bc0d2fdc9e7709c3406..9a92e0493e39a6204b9743e0ef5d6478980bf9c3 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 29e3428b8ee2d05f3b78511c8e0bc28d23c450a3..9a941f15349cad1784fdd46faf2edcb886261556 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 de97f7a7a1ef453f4582480313ffd35cf8818f23..7d81b939f7513ffa5d8ca5bab2c9441558a22feb 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 d04157d7f65a945cbefa263a869a0dedd1bbee8a..f8802285992cd40e9db4f691462c46b203a79ae8 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 aa98ab169fcc6954da038342242e7f034a793bad..3eaa4bb1948ffca6cc0267e0ede8319993be385b 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 eb9c48f419b9c6d33727cd269497ba5d34994bac..85d218de15b8fa4144a159eb4fa4faf18a3b985f 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 e615e9816f3cc6039cf7cfdede42517fcd9aeb18..868c6d02bb1aea0468f6e41d505452273f52e5e1 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 fce8653551182c36e2f7a4f406a7603d635e3722..5c6a64fb7aabcc423226634f0613fa0a2a2bd9c1 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 7867ff7bcefebf04e0b038862b5806770bf6fa2c..83feffab97704379d640b41b1006defc736eb41d 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 03ba4b5fb506701149af67adae480a0f19d02c40..4fa63cefe7cc7f766484ea1daa34c4634f2b791c 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 d6cb68337242d51b1a4dc4230d7a0c6f00f0392c..e3add86457bd08e9a42d01debccf9fa7b319e689 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 f890c9a8a39c3aab6551803d0be6d0c0d288a694..86427b1f17d8973d04b69a0716692570cbc052d0 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 68ee417077c1801a647d6125d2c9daa8d12dc67e..aefb0c04f90ce75725017fcc9bb0d26be42fd6c9 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 01c277c1680dd2a365893d115fc604194c112d61..3f4182aedf9e19a709287f435d5b2f4302f27d9a 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 6a2f12803e0d172ac0064ecb1aa945ac4ad815b6..7d8e571a90973aab75614b0751da802b60baeb02 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",