diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-03 18:12:52 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-06 16:34:17 +0000 |
| commit | 4adc1012e19f5e12ab2fb96effc9ea88d2a05eda (patch) | |
| tree | 585b19485d52f94295adc64c08bed44a95a11f8d /qmake/generators | |
| parent | ad51c8aa0a00c1bbec7386472ca454079e284051 (diff) | |
add a bunch of complementary options to -after
in particular, -before (just for symmetry, as it's the default), -early
(the actual objective), and -late (for symmetry again).
Change-Id: I274303582a348b052c3e5106ff360ab4fd7d4ee2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 8 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index e45217cb45..3f6af8fc08 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" @@ -353,8 +353,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; } diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index ef4e9f29b6..a7312d0124 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -664,8 +664,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; @@ -719,7 +719,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) { |