Use qmake .depends instead of CONFIG += ordered.

Fixes my sporadic build issues with IncrediBuild.

Change-Id: I825c1473dac63159ae592814596dce3484467321
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Karsten Heimrich 2015-06-10 11:49:10 +02:00
parent 97b5fe3ebc
commit cb7613e816
5 changed files with 12 additions and 7 deletions

View File

@ -1,17 +1,23 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += src tools
tools.depends = src
include (installerfw.pri)
include (doc/doc.pri)
BUILD_TESTS = $$(BUILDTESTS)
isEmpty(BUILD_TESTS):BUILD_TESTS=$${BUILDTESTS}
!isEmpty(BUILD_TESTS):SUBDIRS += tests
!isEmpty(BUILD_TESTS) {
SUBDIRS += tests
tests.depends = src
}
BUILD_EXAMPLES = $$(BUILDEXAMPLES)
isEmpty(BUILD_EXAMPLES):BUILD_EXAMPLES=$${BUILDEXAMPLES}
!isEmpty(BUILD_EXAMPLES):SUBDIRS += examples
!isEmpty(BUILD_EXAMPLES) {
SUBDIRS += examples
examples.depends = src
}
!minQtVersion(5, 4, 0) {
message("Cannot build Qt Installer Framework with Qt version $${QT_VERSION}.")

View File

@ -1,3 +1,3 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += 7zip installer
installer.depends = 7zip

View File

@ -1,6 +1,7 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += libs sdk
sdk.depends = libs
TRANSLATIONS += sdk/translations/de.ts \
sdk/translations/en.ts \
sdk/translations/fr.ts \

View File

@ -1,4 +1,3 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS = \

View File

@ -1,4 +1,3 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS += \