From 70c475c8470f8ff6a889dfa936606452a954f1c1 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 6 Mar 2015 08:35:55 +0200
Subject: [PATCH] Project: Exclude project directory from include path

Some environments include the project directory by default, and some
don't (e.g. qbs).

In order to avoid compilation errors on the environments that don't,
unconditionally exclude the project directory.

Change-Id: I8552a269735b42efff1839fb18ce863eed711b7a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 qtcreator.pri           | 4 +++-
 src/qtcreatorplugin.pri | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/qtcreator.pri b/qtcreator.pri
index 04a2cf76e5b..7c8cd355729 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -107,7 +107,9 @@ for(dir, QTC_PLUGIN_DIRS) {
     INCLUDEPATH += $$dir
 }
 
-CONFIG += depend_includepath
+CONFIG += \
+    depend_includepath \
+    no_include_pwd
 
 LIBS += -L$$IDE_LIBRARY_PATH
 
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index a478f498aa3..5381b6de835 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -62,6 +62,7 @@ isEmpty(USE_USER_DESTDIR) {
     DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION"
 }
 LIBS += -L$$DESTDIR
+INCLUDEPATH += $$OUT_PWD
 
 # copy the plugin spec
 isEmpty(TARGET) {