1 files changed, 15 insertions, 7 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 11623cd147..a45b676d5f 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -627,7 +627,7 @@ MakefileGenerator::init()
                 compiler.flags |= Compiler::CompilerNoCheckDeps;
             compilers.append(compiler);
         }
-        for (ProStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) {
+        for (ProStringList::ConstIterator it = quc.cbegin(); it != quc.cend(); ++it) {
             const ProStringList &inputs = v[ProKey(*it + ".input")];
             for(x = 0; x < inputs.size(); ++x) {
                 Compiler compiler;
@@ -1023,6 +1023,14 @@ MakefileGenerator::writePrlFile(QTextStream &t)
         for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
             t << qv(project->values((*it).toKey()));
         t << endl;
+
+        t << "QMAKE_PRL_LIBS_FOR_CMAKE = ";
+        QString sep;
+        for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
+            t << sep << project->values((*it).toKey()).join(';').replace('\\', "\\\\");
+            sep = ';';
+        }
+        t << endl;
     }
 }
 
@@ -1911,7 +1919,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                     replaceExtraCompilerVariables(tmp_out, input, QString(), NoShell),
                     FileFixifyFromOutdir));
         } else {
-            for (ProStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
+            for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
                 t << ' ' << escapeDependencyPath(fileFixify(
                         replaceExtraCompilerVariables(tmp_out, (*input).toQString(), QString(), NoShell),
                         FileFixifyFromOutdir));
@@ -1946,7 +1954,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                 const QString del_statement("-$(DEL_FILE)");
                 if(!wrote_clean) {
                     QStringList dels;
-                    for (ProStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
+                    for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
                         QString tinp = (*input).toQString();
                         QString out = replaceExtraCompilerVariables(tmp_out, tinp, QString(), NoShell);
                         for (const QString &rc : qAsConst(raw_clean)) {
@@ -1975,7 +1983,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                 if(!cleans.isEmpty())
                     t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, "");
                 if(!wrote_clean_cmds) {
-                    for (ProStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
+                    for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
                         QString tinp = (*input).toQString();
                         t << "\n\t" << replaceExtraCompilerVariables(tmp_clean_cmds, tinp,
                                          replaceExtraCompilerVariables(tmp_out, tinp, QString(), NoShell), TargetShell);
@@ -1994,7 +2002,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
             QStringList deps, inputs;
             if(!tmp_dep.isEmpty())
                 deps += fileFixify(tmp_dep, FileFixifyFromOutdir);
-            for (ProStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
+            for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
                 QString inpf = (*input).toQString();
                 deps += findDependencies(inpf);
                 inputs += Option::fixPathToTargetOS(inpf, false);
@@ -2066,7 +2074,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
             t << "\n\t" << cmd << endl << endl;
             continue;
         }
-        for (ProStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) {
+        for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
             QString inpf = (*input).toQString();
             QStringList deps;
             deps << fileFixify(inpf, FileFixifyFromOutdir);
@@ -3394,7 +3402,7 @@ MakefileGenerator::writePkgConfigFile()
             libs << "QMAKE_LIBS_PRIVATE";
             libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
             t << "Libs.private:";
-            for (ProStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
+            for (ProStringList::ConstIterator it = libs.cbegin(); it != libs.cend(); ++it)
                 t << ' ' << fixLibFlags((*it).toKey()).join(' ');
             t << endl;
         }