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

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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment