diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-03-06 08:35:55 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-16 12:41:30 +0000 |
| commit | 70c475c8470f8ff6a889dfa936606452a954f1c1 (patch) | |
| tree | 95222600d17572672127230bb94d8e1ef30a2395 | |
| parent | 51edafece5b4a2bbf163d131ae606e38af00f895 (diff) | |
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>
| -rw-r--r-- | qtcreator.pri | 4 | ||||
| -rw-r--r-- | src/qtcreatorplugin.pri | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 04a2cf76e5..7c8cd35572 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 a478f498aa..5381b6de83 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) { |