aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
Commit message (Expand)AuthorAgeFilesLines
* QmlDesigner: Always add the iso icons to the qrc mappingThomas Hartmann2017-05-221-0/+1
* QmlDesigner: rename RewriterError -> DocumentMessageTim Jenssen2017-01-101-6/+6
* QmlDesigner: refactoring load methodTim Jenssen2016-11-301-0/+3
* QmlDesigner: Implementing dynamic node propertiesThomas Hartmann2016-09-221-0/+6
* QmlDesigner: merge QmlWarningDialog and DocumentWarningWidgetTim Jenssen2016-05-201-2/+0
* Wholesale conversion to #pragma oncehjk2016-03-301-4/+1
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-10/+10
* Qt Quick Designer: License change to Qt Commercial + GPLv3Alessandro Portale2015-09-181-12/+7
* QmlDesigner.Rewriter: Cleaning up the warning codeThomas Hartmann2015-07-151-0/+6
* QmlDesigenr: Collect qrc urls and create mapping for the qmlpuppetThomas Hartmann2015-07-151-0/+6
* Update LicenseEike Ziller2015-01-161-6/+6
* License updateEike Ziller2014-10-091-7/+8
* QmlDesigner: Fix regression for import pathsThomas Hartmann2014-09-081-0/+4
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
* QmlDesigner: Get imports from the code modelThomas Hartmann2013-11-211-0/+2
* Clean headers in QML-Designer.Friedemann Kleint2013-04-301-1/+0
* QmlDesigner.Model: Adding SignalHandlerPropertyThomas Hartmann2013-04-021-1/+15
* QmlDesigner: Type of the propertyname is now PropertyNameThomas Hartmann2013-03-251-22/+22
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
* | QmlDesigner: fix gcc warningshjk2012-11-231-1/+1
* | QmlDesigner: export core functionalityThomas Hartmann2012-11-211-2/+2
|/
* Adjust license headershjk2012-10-051-21/+20
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
* Long live the king!hjk2012-01-261-1/+1
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-251-2/+2
|\
| * QmlDesigner: crash fixThomas Hartmann2011-11-181-2/+2
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\|
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
* | QmlJS: Make Document::Ptr point to a const Document.Christian Kamm2011-11-081-1/+1
|/
* 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