diff options
author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-10 11:49:10 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-10 12:53:33 +0000 |
commit | cb7613e8163b03fe94f54c307404e427b69d025c (patch) | |
tree | 4b30901829b7447bbd84627c0a4b0c7a290a01d5 /installerfw.pro | |
parent | 97b5fe3ebc452d74d70cc7e5a325599ba607cea1 (diff) |
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>
Diffstat (limited to 'installerfw.pro')
-rw-r--r-- | installerfw.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/installerfw.pro b/installerfw.pro index 6dfca3997..3f2ed2383 100644 --- a/installerfw.pro +++ b/installerfw.pro @@ -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}.") |