diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2017-08-18 15:43:37 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2017-08-25 10:32:32 +0000 |
| commit | ab323c5bf488db20750407abd4cdb93b894803ce (patch) | |
| tree | 1a9ca8b9ed2d155a900cfde808a9f401b3b7e90e /configure.pri | |
| parent | dbaa4de28e5cdfa1787af77d236586833786ee61 (diff) | |
Append the QMAKE_EXTRA_ARGS to the output instead of overwriting it
When QMAKE_* variable assignments were passed to the configure line
they would cause the current contents of the private pro output to be
overwritten. This would cause anything added to it before the QMAKE_*
variable assignments to be parsed to be lost.
Change-Id: Idcb8cad5f07cbb96b4da204384f5618b95b375b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index 76bb27e4ae..83c0dee141 100644 --- a/configure.pri +++ b/configure.pri @@ -1041,7 +1041,7 @@ defineTest(qtConfOutput_gccSysroot) { defineTest(qtConfOutput_qmakeArgs) { !$${2}: return() - $${currentConfig}.output.privatePro = "!host_build|!cross_compile {" + $${currentConfig}.output.privatePro += "!host_build|!cross_compile {" for (a, config.input.qmakeArgs) { $${currentConfig}.output.privatePro += " $$a" EXTRA_QMAKE_ARGS += $$system_quote($$a) |