From ab323c5bf488db20750407abd4cdb93b894803ce Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 18 Aug 2017 15:43:37 +0200 Subject: [PATCH] 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 --- configure.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.pri b/configure.pri index 76bb27e4ae4..83c0dee141d 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)