feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Project: Exclude project directory from include path

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2015-03-06 08:35:55 +02:00
committed by Eike Ziller
parent 51edafece5
commit 70c475c847
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qtcreator.pri
View File

@@ -107,7 +107,9 @@ for(dir, QTC_PLUGIN_DIRS) {
INCLUDEPATH += $$dir INCLUDEPATH += $$dir
} }
CONFIG += depend_includepath CONFIG += \
depend_includepath \
no_include_pwd
LIBS += -L$$IDE_LIBRARY_PATH LIBS += -L$$IDE_LIBRARY_PATH

1
src/qtcreatorplugin.pri
View File

@@ -62,6 +62,7 @@ isEmpty(USE_USER_DESTDIR) {
DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION" DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION"
} }
LIBS += -L$$DESTDIR LIBS += -L$$DESTDIR
INCLUDEPATH += $$OUT_PWD
# copy the plugin spec # copy the plugin spec
isEmpty(TARGET) { isEmpty(TARGET) {