diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-10-08 12:01:45 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-09 19:17:36 +0200 |
| commit | 2dcac577ba282ee3e99c826dd0620a7f10bd3503 (patch) | |
| tree | 8d3d5012bd91015d29098367aac31c10ea58ec9e | |
| parent | 8a7518ccae6254d2f60f96c43df338d23f3acc67 (diff) | |
| download | qt-creator-2dcac577ba282ee3e99c826dd0620a7f10bd3503.tar.gz | |
Fixed transient compile failure with highly parallel jom.
These .pri files which add to INCLUDEPATH and have FORMS should also add
to DEPENDPATH.
Adding to INCLUDEPATH does not add to DEPENDPATH by default with qmake.
That means qmake may not find headers in those paths and won't
consider them dependencies when compiling the source files which include
them.
This doesn't matter when all the headers in the new INCLUDEPATH are
always present, but when some of them are generated (e.g. from FORMS),
the dependencies are important and omitting them means a race condition
in parallel builds.
Fixes errors of the form:
..\..\shared\help\topicchooser.h(33) : fatal error C1083: Cannot open
include file: 'ui_topicchooser.h': No such file or directory
(cherry picked from commit 9a7e02946ab702e25f1b616187492dd1a3486727)
| -rw-r--r-- | src/plugins/debugger/cdb/cdb.pri | 1 | ||||
| -rw-r--r-- | src/plugins/designer/cpp/cpp.pri | 1 | ||||
| -rw-r--r-- | src/plugins/git/gitorious/gitorious.pri | 1 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri | 1 | ||||
| -rw-r--r-- | src/shared/help/help.pri | 1 | ||||
| -rw-r--r-- | src/shared/proparser/proparser.pri | 1 | ||||
| -rw-r--r-- | src/shared/qrceditor/qrceditor.pri | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri index 16c3377649..ff877890a4 100644 --- a/src/plugins/debugger/cdb/cdb.pri +++ b/src/plugins/debugger/cdb/cdb.pri @@ -27,6 +27,7 @@ CDB_PLATFORM=i386 INCLUDEPATH*=$$CDB_PATH INCLUDEPATH*=$$PWD +DEPENDPATH*=$$PWD CDB_LIBPATH=$$CDB_PATH/lib/$$CDB_PLATFORM diff --git a/src/plugins/designer/cpp/cpp.pri b/src/plugins/designer/cpp/cpp.pri index a30a794022..2df8138f63 100644 --- a/src/plugins/designer/cpp/cpp.pri +++ b/src/plugins/designer/cpp/cpp.pri @@ -1,4 +1,5 @@ INCLUDEPATH+=$$PWD +DEPENDPATH+=$$PWD DEFINES+=CPP_ENABLED diff --git a/src/plugins/git/gitorious/gitorious.pri b/src/plugins/git/gitorious/gitorious.pri index 8678042a26..d10e09c15b 100644 --- a/src/plugins/git/gitorious/gitorious.pri +++ b/src/plugins/git/gitorious/gitorious.pri @@ -1,5 +1,6 @@ QT += network INCLUDEPATH+=$$PWD +DEPENDPATH+=$$PWD HEADERS += $$PWD/gitoriousclonewizard.h \ $$PWD/gitorioushostwizardpage.h \ diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri index 4547080e96..374fca6aec 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri @@ -1,4 +1,5 @@ INCLUDEPATH *= $$PWD +DEPENDPATH *= $$PWD SOURCES += \ $$PWD/plugingenerator.cpp \ $$PWD/classlist.cpp \ diff --git a/src/shared/help/help.pri b/src/shared/help/help.pri index dff0ae7699..69801bb672 100644 --- a/src/shared/help/help.pri +++ b/src/shared/help/help.pri @@ -1,6 +1,7 @@ VPATH += $$PWD INCLUDEPATH *= $$PWD $$PWD/.. +DEPENDPATH *= $$PWD $$PWD/.. # Input HEADERS += \ diff --git a/src/shared/proparser/proparser.pri b/src/shared/proparser/proparser.pri index d1c5d630e8..8b274d51b2 100644 --- a/src/shared/proparser/proparser.pri +++ b/src/shared/proparser/proparser.pri @@ -2,6 +2,7 @@ VPATH += $$PWD QT += xml INCLUDEPATH *= $$PWD $$PWD/.. +DEPENDPATH *= $$PWD $$PWD/.. # Input HEADERS += \ diff --git a/src/shared/qrceditor/qrceditor.pri b/src/shared/qrceditor/qrceditor.pri index 47e54c936e..00c26ce677 100644 --- a/src/shared/qrceditor/qrceditor.pri +++ b/src/shared/qrceditor/qrceditor.pri @@ -1,4 +1,5 @@ INCLUDEPATH *= $$PWD $$PWD/.. +DEPENDPATH *= $$PWD $$PWD/.. QT *= xml |