Commit 614bb335 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Christian Kandeler

qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin

Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
parent 009c3f1a
......@@ -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: ".."
}
}
......@@ -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: [ "." ]
}
}
......@@ -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" }
......
......@@ -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 {
]
}
}
......@@ -4,10 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "ExtensionSystem"
cpp.includePaths: [
".",
".."
]
cpp.defines: base.concat([
"EXTENSIONSYSTEM_LIBRARY",
"IDE_TEST_DIR=\".\""
......
......@@ -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: ["."]
}
}
......@@ -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"
......
......@@ -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: ["."]
}
}
......@@ -31,7 +31,7 @@
#ifndef COLORBOX_H
#define COLORBOX_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QWidget>
#include <qdeclarative.h>
......
......@@ -31,7 +31,7 @@
#ifndef COLORBUTTON_H
#define COLORBUTTON_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QToolButton>
#include <qdeclarative.h>
......
......@@ -31,7 +31,7 @@
#ifndef COLORWIDGET_H
#define COLORWIDGET_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
namespace QmlEditorWidgets {
......
......@@ -31,7 +31,7 @@
#ifndef CONTEXTPANETEXTWIDGET_H
#define CONTEXTPANETEXTWIDGET_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QWidget>
QT_BEGIN_NAMESPACE
......
......@@ -31,7 +31,7 @@
#ifndef CONTEXTPANEWIDGET_H
#define CONTEXTPANEWIDGET_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QFrame>
#include <QPointer>
......
......@@ -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>
......
......@@ -31,7 +31,7 @@
#ifndef CONTEXTPANEWIDGETRECTANGLE_H
#define CONTEXTPANEWIDGETRECTANGLE_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QWidget>
QT_BEGIN_NAMESPACE
......
......@@ -31,7 +31,7 @@
#ifndef CUSTOMCOLORDIALOG_H
#define CUSTOMCOLORDIALOG_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QFrame>
QT_BEGIN_NAMESPACE
......
......@@ -32,7 +32,7 @@
#ifndef FILEWIDGET_H
#define FILEWIDGET_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QWidget>
......
......@@ -31,7 +31,7 @@
#ifndef FONTSIZESPINBOX_H
#define FONTSIZESPINBOX_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QAbstractSpinBox>
namespace QmlEditorWidgets {
......
......@@ -31,7 +31,7 @@
#ifndef GRADIENTLINE_H
#define GRADIENTLINE_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QWidget>
#include <QLinearGradient>
......
......@@ -31,7 +31,7 @@
#ifndef HUECONTROL_H
#define HUECONTROL_H
#include <qmleditorwidgets_global.h>
#include "qmleditorwidgets_global.h"
#include <QWidget>
#include <qdeclarative.h>
......
......@@ -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: ["."]
}
}
......@@ -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"
]
......
......@@ -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: [".."]
}
}
......@@ -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;
......
......@@ -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>
......
......@@ -29,9 +29,8 @@
**************************************************************************/
#include "synchronousprocess.h"
#include "qtcassert.h"
#include "hostosinfo.h"
#include <qtcassert.h>
#include <QDebug>
#include <QTimer>
......
......@@ -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: [".."]
}
}
......@@ -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: ["."]
}
}
......@@ -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" ]
......
......@@ -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" }
}
}
......
......@@ -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",
......
......@@ -13,12 +13,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
cpp.includePaths: [
".",
"..",
"../../libs",
buildDirectory
]
files: [
"autogenstep.cpp",
......
......@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
"../../libs",
buildDirectory
]
files: [
"annotationhighlighter.cpp",
......
......@@ -11,11 +11,6 @@ QtcPlugin {
Depends { name: "Find" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
"../../libs",
buildDirectory
]
files: [
"bineditor.cpp",
......
......@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
"../../libs",
buildDirectory
]
files: [
"bookmark.cpp",
......
......@@ -13,11 +13,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
"../../libs",
buildDirectory
]
files: [
"classview.qrc",
......
......@@ -18,12 +18,6 @@ QtcPlugin {
Depends { name: "cpp" }
cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
cpp.includePaths: [
".",
"..",
"../../libs",
buildDirectory
]
files: [
"activityselector.cpp",
......
......@@ -14,14 +14,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "QtSupport" }
Depends { name: "cpp" }
cpp.includePaths: [
".",
"..",
"../../libs",
buildDirectory
]
files: [
"CMakeProject.mimetypes.xml",
"cmakebuildconfiguration.cpp",
......
......@@ -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"
]
}
}
......@@ -31,7 +31,7 @@
#ifndef INAVIGATIONWIDGET_H
#define INAVIGATIONWIDGET_H
#include <coreplugin/id.h>
#include "id.h"
#include <QObject>
#include <QList>
......
......@@ -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>
......
......@@ -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",
......
......@@ -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",
]
}
......@@ -31,7 +31,7 @@
#ifndef CPPFUNCTIONSFILTER_H
#define CPPFUNCTIONSFILTER_H
#include <cpplocatorfilter.h>
#include "cpplocatorfilter.h"
namespace CppTools {
namespace Internal {
......
......@@ -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" }
}
}
......@@ -12,13 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
"../../libs",
buildDirectory
]
files: [
"annotationhighlighter.cpp",
"annotationhighlighter.h",
......
......@@ -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)
......
......@@ -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"