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

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

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>

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>