summaryrefslogtreecommitdiffstats
path: root/qmake/library/qmakeparser.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* don't pretend that break()/next()/return() are functionsOswald Buddenhagen2012-09-131-0/+47
| | | | | | | | | | | | | | it's a pretty braindead thing to implement control flow statements as (built-in) functions. as a "side effect", this fixes return() value handling for lists. (cherry picked from qtcreator/f53ed6c4b3feca59a94d4f0de8b1a7411122e30e) (cherry picked from qtcreator/f529e22ec38fb9a656d74394e484d2453cf42c69) Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546 Reviewed-by: Qt Doc Bot <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]>
* improve parse error recovery pathsOswald Buddenhagen2012-09-131-4/+7
| | | | | | | | | | to reduce collateral damage from parse errors. (cherry picked from qtcreator/00c0d0d5e42d28e03c2846c17d3acbcd8420859d) Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9 Reviewed-by: Qt Doc Bot <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]>
* port qmake to qt creator's qmake language evaluatorOswald Buddenhagen2012-09-111-0/+1185
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 <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>