diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-05 18:29:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 00:13:01 +0200 |
| commit | 0e78e5080262b8fa7a86f7cd0c8716839db048f6 (patch) | |
| tree | 83ca3f608a6c9a359ba783d496ffdbc9ef7a6073 /qmake/generators/win32 | |
| parent | ed7594db5db7b28ce4c4646624de97b52fbf16d5 (diff) | |
port qmake to qt creator's qmake language evaluator
this is a monster commit which does the following things:
- import the evaluator as-is from qt creator into qmake/library/
- integrate it into qmake's makefiles
- overwrite proitems.h with actual special types
- remove the parts of Option which are redundant with QMakeGlobals
- make QMakeProperty a singleton owned by Option::globals. the dynamic
handling so far made no sense.
- make QMakeProject a subclass of QMakeEvaluator, with relatively few
extensions
the changes to existing qmake code outside project.* and option.* are
minor. implementing the changes gradually would mean changing a lot of
code which will be just replaced in the next commit, so i'm not wasting
my time on it.
Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators/win32')
| -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 b27b638d42..db88dcc152 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -442,8 +442,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 - QStringList old_after_vars = Option::after_user_vars; - Option::after_user_vars.append("CONFIG+=release"); + QString old_after_vars = Option::globals->postcmds; + Option::globals->postcmds.append("\nCONFIG+=release"); QStringList subdirs = collectSubDirs(project); for(int i = 0; i < subdirs.size(); ++i) { @@ -627,7 +627,7 @@ nextfile: t << _slnProjDepBeg; // Restore previous after_user_var options - Option::after_user_vars = old_after_vars; + Option::globals->postcmds = old_after_vars; // Figure out dependencies for(QList<VcsolutionDepend*>::Iterator it = solution_cleanup.begin(); it != solution_cleanup.end(); ++it) { |