Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Ieb57137ee2b7d0c505e3531d5aa1bcb66978847e

1 files changed, 19 insertions, 0 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 9e2f449515..3a71f9d3de 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2212,6 +2212,25 @@ MakefileGenerator::writeExtraVariables(QTextStream &t)
     }
 }
 
+// This is a more powerful alternative to the above function.
+// It's meant to be internal, as one can make quite a mess with it.
+void
+MakefileGenerator::writeExportedVariables(QTextStream &t)
+{
+    const auto &vars = project->values("QMAKE_EXPORTED_VARIABLES");
+    if (vars.isEmpty())
+        return;
+    for (const auto &exp : vars) {
+        const ProString &name = project->first(ProKey(exp + ".name"));
+        const ProString &value = project->first(ProKey(exp + ".value"));
+        if (!value.isEmpty())
+            t << name << " = " << value << endl;
+        else
+            t << name << " =\n";
+    }
+    t << endl;
+}
+
 bool
 MakefileGenerator::writeDummyMakefile(QTextStream &t)
 {