diff options
| author | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2014-01-05 15:03:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 07:16:37 +0100 |
| commit | 1de258a2adc3421159075d38da4efb3b3df02f94 (patch) | |
| tree | d8be3492ff0ac95810d2ea9e4d17d7e65d9db0df /scripts/qt | |
| parent | 38a26e6605270e801c2ede6e026f7591cdc3200d (diff) | |
Use predefined QMAKEFLAGS from environment variable in build
Instead of creating a local new empty environment variable,
we now append new parameters on top of the environment variable
which we make local.
Change-Id: I228a2badf39b71986b5263aa93d421bd6de2fcec
Reviewed-by: Simo Fält <simo.falt@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index 124fd1fd..cc25f7b7 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -1018,7 +1018,8 @@ sub run_compile my $make_target = "module-$qt_gitmodule"; push @commands, sub { - local $ENV{'QMAKEFLAGS'} = join(" ", map { '"'.$_.'"' } @qmake_args); + my $global_qmakeflags = $ENV{'QMAKEFLAGS'}; + local $ENV{'QMAKEFLAGS'} = join(" ", map { '"'.$_.'"' } $global_qmakeflags, @qmake_args); $self->exe( $make_bin, @make_args, $make_target ); }; } |