qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin

Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

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

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>

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>