OSDN Git Service

Fixed transient compile failure with highly parallel jom.
authorRohan McGovern <rohan.mcgovern@nokia.com>
Thu, 8 Oct 2009 10:01:45 +0000 (12:01 +0200)
committercon <qtc-committer@nokia.com>
Mon, 12 Oct 2009 09:11:01 +0000 (11:11 +0200)
commiteacb27f1fb114046c5cf7881eca2bf841ab8b334
treefd4a1c28abd55d2832ca2b7af92bb5e1ef4746fa
parent420b09e8c25e92fc173ff6f6a6547fd7f13699d3
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)
src/plugins/debugger/cdb/cdb.pri
src/plugins/designer/cpp/cpp.pri
src/plugins/git/gitorious/gitorious.pri
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
src/shared/help/help.pri
src/shared/proparser/proparser.pri
src/shared/qrceditor/qrceditor.pri