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 <[email protected]>
vellw · Aug 25, 2017 · ab323c5 · ab323c5
1 parent dbaa4de
commit ab323c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)