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 9a7e02946a)
This commit is contained in:
Rohan McGovern
2009-10-08 12:01:45 +02:00
committed by con
parent 8a7518ccae
commit 2dcac577ba
7 changed files with 7 additions and 0 deletions

View File

@@ -27,6 +27,7 @@ CDB_PLATFORM=i386
INCLUDEPATH*=$$CDB_PATH
INCLUDEPATH*=$$PWD
DEPENDPATH*=$$PWD
CDB_LIBPATH=$$CDB_PATH/lib/$$CDB_PLATFORM

View File

@@ -1,4 +1,5 @@
INCLUDEPATH+=$$PWD
DEPENDPATH+=$$PWD
DEFINES+=CPP_ENABLED

View File

@@ -1,5 +1,6 @@
QT += network
INCLUDEPATH+=$$PWD
DEPENDPATH+=$$PWD
HEADERS += $$PWD/gitoriousclonewizard.h \
$$PWD/gitorioushostwizardpage.h \

View File

@@ -1,4 +1,5 @@
INCLUDEPATH *= $$PWD
DEPENDPATH *= $$PWD
SOURCES += \
$$PWD/plugingenerator.cpp \
$$PWD/classlist.cpp \

View File

@@ -1,6 +1,7 @@
VPATH += $$PWD
INCLUDEPATH *= $$PWD $$PWD/..
DEPENDPATH *= $$PWD $$PWD/..
# Input
HEADERS += \

View File

@@ -2,6 +2,7 @@ VPATH += $$PWD
QT += xml
INCLUDEPATH *= $$PWD $$PWD/..
DEPENDPATH *= $$PWD $$PWD/..
# Input
HEADERS += \

View File

@@ -1,4 +1,5 @@
INCLUDEPATH *= $$PWD $$PWD/..
DEPENDPATH *= $$PWD $$PWD/..
QT *= xml