Commit 2dcac577ba282ee3e99c826dd0620a7f10bd3503

  • avatar
  • con <qtc-committer @no…a.com> (Committer)
  • Fri Oct 09 19:17:36 CEST 2009
  • avatar
  • Rohan McGovern (Author)
  • Thu Oct 08 12:01:45 CEST 2009
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)
  
2727
2828INCLUDEPATH*=$$CDB_PATH
2929INCLUDEPATH*=$$PWD
30DEPENDPATH*=$$PWD
3031
3132CDB_LIBPATH=$$CDB_PATH/lib/$$CDB_PLATFORM
3233
  
11INCLUDEPATH+=$$PWD
2DEPENDPATH+=$$PWD
23
34DEFINES+=CPP_ENABLED
45
  
11QT += network
22INCLUDEPATH+=$$PWD
3DEPENDPATH+=$$PWD
34
45HEADERS += $$PWD/gitoriousclonewizard.h \
56 $$PWD/gitorioushostwizardpage.h \
  
11INCLUDEPATH *= $$PWD
2DEPENDPATH *= $$PWD
23SOURCES += \
34 $$PWD/plugingenerator.cpp \
45 $$PWD/classlist.cpp \
  
11VPATH += $$PWD
22
33INCLUDEPATH *= $$PWD $$PWD/..
4DEPENDPATH *= $$PWD $$PWD/..
45
56# Input
67HEADERS += \
  
22QT += xml
33
44INCLUDEPATH *= $$PWD $$PWD/..
5DEPENDPATH *= $$PWD $$PWD/..
56
67# Input
78HEADERS += \
  
11INCLUDEPATH *= $$PWD $$PWD/..
2DEPENDPATH *= $$PWD $$PWD/..
23
34QT *= xml
45