summaryrefslogtreecommitdiffstats
path: root/scripts/qt
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-05-02 19:16:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-03 15:54:28 +0200
commite68d6c161f42892331a5a781245fa747b675a904 (patch)
tree0818166b848f7f814522937d1c7932556c00f988 /scripts/qt
parentc0c38e8b4544043715e659172ab073d1cd2ba38e (diff)
don't skip tools from minimalized build
the switch to <module>_BUILD_PARTS turned += into = as a side effect. compensate by explicitly including libs & tools. this went unnoticed so far, because the only repo in which an autotest would catch it (qttools) didn't even pay attention to the tools exclusion so far. Change-Id: Ia97c0b881a7028f6f8f6e855224d5110cf9e2f43 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'scripts/qt')
-rwxr-xr-xscripts/qt/qtmod_test.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl
index 9071d53e..7b2035b9 100755
--- a/scripts/qt/qtmod_test.pl
+++ b/scripts/qt/qtmod_test.pl
@@ -975,7 +975,7 @@ sub run_compile
# Qt 5 only:
# minimal deps mode? Then we turned off some build parts in configure, and must
# now explicitly enable them for this module only.
- push @qmake_args, uc($qt_gitmodule)."_BUILD_PARTS = ".join(" ", @OPTIONAL_BUILD_PARTS);
+ push @qmake_args, uc($qt_gitmodule)."_BUILD_PARTS = libs tools ".join(" ", @OPTIONAL_BUILD_PARTS);
}
if (($self->{'qt.gitmodule'} eq 'qt5') or ($self->{'qt.gitmodule'} eq 'qt')) {