Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	configure.json
	mkspecs/win32-icc/qmake.conf

Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f

1 files changed, 4 insertions, 4 deletions

diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index d4532315d0..eb4f46cd7e 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -326,8 +326,8 @@ ProjectGenerator::writeMakefile(QTextStream &t)
     t << "######################################################################" << endl;
     t << "# Automatically generated by qmake (" QMAKE_VERSION_STR ") " << QDateTime::currentDateTime().toString() << endl;
     t << "######################################################################" << endl << endl;
-    if (!Option::globals->precmds.isEmpty())
-        t << Option::globals->precmds << endl;
+    if (!Option::globals->extra_cmds[QMakeEvalBefore].isEmpty())
+        t << Option::globals->extra_cmds[QMakeEvalBefore] << endl;
     t << getWritableVar("TEMPLATE_ASSIGN", false);
     if(project->first("TEMPLATE_ASSIGN") == "subdirs") {
         t << endl << "# Directories" << "\n"
@@ -364,8 +364,8 @@ ProjectGenerator::writeMakefile(QTextStream &t)
           << getWritableVar("RESOURCES")
           << getWritableVar("TRANSLATIONS");
     }
-    if (!Option::globals->postcmds.isEmpty())
-        t << Option::globals->postcmds << endl;
+    if (!Option::globals->extra_cmds[QMakeEvalAfter].isEmpty())
+        t << Option::globals->extra_cmds[QMakeEvalAfter] << endl;
     return true;
 }