diff options
| author | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2014-02-28 11:20:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 07:27:06 +0100 |
| commit | 388daf9c020f2e3aa99c4d02d16e958c47c24791 (patch) | |
| tree | 1d06d21b3e2ef2f0152c56ebe2f93ba1887e786e /scripts/qt | |
| parent | a40f91f7289b160e35f04f0655bcc876d63356c2 (diff) | |
Skip building of tools in case of xplatform being in configure args
Change-Id: I9823a931a188d55037e9724b5ca93e26c1cbdb31
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index 17e0a6c4..a074932c 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -984,6 +984,8 @@ sub run_compile my $qt_gitmodule_build_dir = $self->{ 'qt.gitmodule.build.dir' }; my $make_bin = $self->{ 'make.bin' }; my $make_args = $self->{ 'make.args' }; + my $qt_configure_args = $self->{ 'qt.configure.args' }; + my $qt_configure_extra_args = $self->{ 'qt.configure.extra_args' }; my $qt_make_install = $self->{ 'qt.make_install' }; my $qt_minimal_deps = $self->{ 'qt.minimal_deps' }; @@ -999,11 +1001,13 @@ sub run_compile my @commands; my @qmake_args; + # do not build tools when targeting xplatform + my $make_tools = ($qt_configure_extra_args =~ m/-xplatform/ or $qt_configure_args =~ m/-xplatform/) ? "" : "tools "; if ($qt_minimal_deps) { # 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 = libs tools ".join(" ", @OPTIONAL_BUILD_PARTS); + push @qmake_args, uc($qt_gitmodule)."_BUILD_PARTS = libs $make_tools".join(" ", @OPTIONAL_BUILD_PARTS); } if (($self->{'qt.gitmodule'} eq 'qt5') or ($self->{'qt.gitmodule'} eq 'qt')) { |