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>

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>
614bb335 · Orgad Shaneh · Christian Kandeler · 009c3f1a · 614bb335 · 614bb335
Commit 614bb335 authored Sep 27, 2012 by Orgad Shaneh Committed by Christian Kandeler Oct 05, 2012
75 changed files
--- 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: ".."
    }
 }
--- 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: [ "." ]
+    }
 }
--- 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" }


--- 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 {
        ]
    }
 }
-
--- 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=\".\""

--- 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: ["."]
-    }
 }

--- 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"

--- 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: ["."]
-    }
 }

--- 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>


--- 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>


--- 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 {


--- 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

--- 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>


--- 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>

--- 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

--- 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

--- 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>


--- 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 {

--- 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>


--- 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>


--- 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: ["."]
-    }
 }

--- 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"
        ]

--- 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: [".."]
    }
 }
--- 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;

--- 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>

--- 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>

--- 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: [".."]
    }
 }

--- 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: ["."]
-    }
 }
--- 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" ]

--- 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" }
    }
 }

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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"
-        ]
    }
 }
-
--- 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>

--- 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>


--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -10,13 +10,7 @@ QtcPlugin {
    Depends { name: "TextEditor" }

    Depends { name: "cpp" }