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/qmake.pro | |
| 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/qmake.pro')
| -rw-r--r-- | qmake/qmake.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 4b03d66fc1..0d92ac21ae 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -6,7 +6,8 @@ option(host_build) CONFIG += console bootstrap CONFIG -= qt shared app_bundle uic -DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED +DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ + PROEVALUATOR_FULL PROEVALUATOR_DEBUG DESTDIR = ../bin/ OBJECTS_DIR = . |