qmake: add QMAKE_EXPORTED_VARIABLES

because QMAKE_EXTRA_VARIABLES sometimes just ain't enough. Change-Id: I739e5b6510e4701ca0a86834e4f9a978d7ef1cf4 Reviewed-by: Joerg Bornemann <[email protected]>
brad0 · Jan 5, 2019 · fff5991 · fff5991
1 parent 2f4eea5
commit fff5991
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git 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)
 {

diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
@@ -79,6 +79,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
     void writeHeader(QTextStream &t);
     void writeSubDirs(QTextStream &t);
     void writeMakeQmake(QTextStream &t, bool noDummyQmakeAll = false);
+    void writeExportedVariables(QTextStream &t);
     void writeExtraVariables(QTextStream &t);
     void writeExtraTargets(QTextStream &t);
     void writeExtraCompilerTargets(QTextStream &t);

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
@@ -180,6 +180,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 
     ProStringList &bundledFiles = project->values("QMAKE_BUNDLED_FILES");
 
+    writeExportedVariables(t);
+
     t << "####### Compiler, tools and options\n\n";
     t << "CC            = " << var("QMAKE_CC") << endl;
     t << "CXX           = " << var("QMAKE_CXX") << endl;

diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
@@ -520,6 +520,8 @@ void Win32MakefileGenerator::writeIncPart(QTextStream &t)
 
 void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
 {
+    writeExportedVariables(t);
+
     t << "####### Compiler, tools and options\n\n";
     t << "CC            = " << var("QMAKE_CC") << endl;
     t << "CXX           = " << var("QMAKE_CXX") << endl;