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.pri | |
| 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.pri')
| -rw-r--r-- | qmake/qmake.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 985e4de3d7..1bf603e874 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -5,7 +5,10 @@ DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_COMPRESS QT_NO_UNICODETABLES \ QT_NO_GEOM_VARIANT QT_NO_DATASTREAM #qmake code -SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ +SOURCES += project.cpp property.cpp main.cpp \ + library/ioutils.cpp library/proitems.cpp library/qmakeglobals.cpp \ + library/qmakeparser.cpp library/qmakeevaluator.cpp library/qmakebuiltins.cpp \ + generators/makefile.cpp \ generators/unix/unixmake2.cpp generators/unix/unixmake.cpp meta.cpp \ option.cpp generators/win32/winmakefile.cpp generators/win32/mingw_make.cpp \ generators/makefiledeps.cpp generators/metamakefile.cpp generators/mac/pbuilder_pbx.cpp \ @@ -18,7 +21,8 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/win32/cesdkhandler.cpp HEADERS += project.h property.h \ - library/qmake_global.h library/proitems.h \ + library/qmake_global.h library/ioutils.h library/proitems.h library/qmakeglobals.h \ + library/qmakeparser.h library/qmakeevaluator.h library/qmakeevaluator_p.h \ generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ generators/win32/winmakefile.h generators/win32/mingw_make.h generators/projectgenerator.h \ |