summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
Commit message (Expand)AuthorAgeFilesLines
* QmlDesigner: crash fixThomas Hartmann2011-11-181-2/+2
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
* Compile.Friedemann Kleint2011-08-081-6/+6
* QmlJS: Remove Interpreter namespace.Christian Kamm2011-08-081-2/+2
* QmlJS: Remove LookupContext.Christian Kamm2011-08-081-5/+4
* QmlDesigner.model: refactoring for nodeSourceThomas Hartmann2011-06-081-2/+15
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
* QmlDesigner.Model: add support for custom parser typesThomas Hartmann2011-05-061-1/+1
* QmlDesigner.rewriter: __model_data becomes an auxiliaryDataThomas Hartmann2011-05-061-1/+2
* Update license.hjk2011-04-131-14/+13
* It's 2011 now.con2011-01-121-1/+1
* Merge branch '2.1'con2010-12-171-7/+11
|\
| * License headers.con2010-12-171-7/+11
* | QmlDesigner.rewriter: exposing lookupContext and documentThomas Hartmann2010-12-011-0/+10
* | QmlDesigner.Rewriter: Support bindings in dynamic property definitionsMarco Bubke2010-11-241-6/+13
|/
* QuickDesigner: Rename "core" directory to "designercore"Kai Koehne2010-05-051-0/+255