diff options
author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
tree | a6259b1e9b6463108796ce912e3d1752e301505f /qmake/generators/win32/msvc_vcproj.cpp | |
parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 3d5b80e06d..48b8bea812 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -568,8 +568,8 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) // Make sure that all temp projects are configured // for release so that the depends are created // without the debug <lib>dxxx.lib name mangling - QString old_after_vars = Option::globals->postcmds; - Option::globals->postcmds.append("\nCONFIG+=release"); + QString old_after_vars = Option::globals->extra_cmds[QMakeEvalAfter]; + Option::globals->extra_cmds[QMakeEvalAfter].append("\nCONFIG+=release"); QHash<QString, QString> profileLookup; QHash<QString, QString> projGuids; @@ -623,7 +623,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) t << slnConf; // Restore previous after_user_var options - Option::globals->postcmds = old_after_vars; + Option::globals->extra_cmds[QMakeEvalAfter] = old_after_vars; t << _slnProjConfBeg; for(QList<VcsolutionDepend*>::Iterator it = solution_cleanup.begin(); it != solution_cleanup.end(); ++it) { |