summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Commit message (Expand)AuthorAgeFilesLines
* Clean headers in lib qmljs and plugins qmljstools, qmljseditor.Friedemann Kleint2015-03-051-0/+1
* QmlDesigner: Remove unneeded qualificationsOrgad Shaneh2015-02-181-6/+6
* QmlDesigner: Removing using namespace QmlJS::AST from TextToModelMergerThomas Hartmann2015-02-181-80/+80
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\
| * Update LicenseEike Ziller2015-01-161-6/+6
* | Catch exceptions by const reference.Christian Kandeler2014-11-281-1/+1
|/
* QmlDesigner: Add support for .ui.qmlThomas Hartmann2014-10-151-2/+9
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\
| * License updateEike Ziller2014-10-091-7/+8
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-161-7/+9
|\ \ | |/
| * QmlJS: Add error message for invalid root item in the designerThomas Hartmann2014-09-101-0/+1
| * QmlDesigner.TextToModelMerger: Fixing comparison of QVariantThomas Hartmann2014-09-091-0/+2
| * QmlDesigner: Fix regression for import pathsThomas Hartmann2014-09-081-7/+6
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-031-2/+3
|\ \ | |/
| * qmljs: fixing used importsFawzi Mohamed2014-08-281-1/+1
| * QmlDesigner.Rewriter: Adding missing global Qt enumsThomas Hartmann2014-08-211-1/+2
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-08-151-1/+7
|\ \ | |/
| * QmlDesigner: do not call converToVariant on ListElementsTim Jenssen2014-08-121-1/+7
* | Merge remote-tracking branch 'origin/3.2'Oswald Buddenhagen2014-08-051-1/+7
|\ \ | |/
| * QmlDesigner.Rewriter: Blacklist a couple of importsThomas Hartmann2014-08-011-0/+4
| * QmlDesigner.Rewriter: We officially support Qt Quick 2.3Thomas Hartmann2014-07-301-1/+3
* | qmljs: improve handling of qml dialectsFawzi Mohamed2014-07-301-2/+2
|/
* QmlDesigner: Fix many implementations of getSnapshotMarco Bubke2014-07-101-1/+1
* QmlDesigner: Don't add empty importsMarco Bubke2014-07-101-1/+1
* qmldesigner: use document specific import pathsFawzi Mohamed2014-07-081-4/+1
* QmlDesigner: Don't show QtQuick import pathsMarco Bubke2014-07-081-1/+2
* QmlDesigner: Don't add imports manuallyMarco Bubke2014-07-081-5/+0
* QmlDesigner: Don't show private importsMarco Bubke2014-07-081-20/+47
* qmldesigner: interpret undefined versions as 1.0Fawzi Mohamed2014-07-071-1/+3
* QmlDesigner: don't ignore unknown componentTim Jenssen2014-07-031-3/+6
* QmlDesigner.Rewriter: Supporting Tab contents as implicit componentThomas Hartmann2014-06-121-1/+1
* QmlDesigner.Rewriter: Adding some more gloabl enumsThomas Hartmann2014-05-231-1/+3
* QmlDesigner: Fix indentationOrgad Shaneh2014-05-211-2/+2
* QmlDesigner: Exchange QLatin1String with QStringLiteralMarco Bubke2014-05-131-35/+35
* QmlDesigner: Remove unused local variablesOrgad Shaneh2014-05-061-4/+0
* QmlDesigner: Refactoring ModelNode::setIdMarco Bubke2014-04-291-3/+3
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
* | QmlDesigner: Refactor enumeration handlingMarco Bubke2013-12-161-2/+3
|/
* QmlDesigner: Get imports from the code modelThomas Hartmann2013-11-211-0/+64
* qmljs: new import/dep trackingFawzi Mohamed2013-11-201-3/+7
* QmlDesigner.Rewriter: Show error for wrong code modelThomas Hartmann2013-11-141-3/+9
* Braces cleanupOrgad Shaneh2013-11-141-2/+1
* QmlDesigner.Rewrtiter: allow Qt Quick 2.2Thomas Hartmann2013-11-111-1/+1
* QmlDesigner.Rewriter: crash fixThomas Hartmann2013-11-081-2/+1
* QmlDesigner.Rewriter: crash fixThomas Hartmann2013-11-081-1/+47
* qmljs: use new qml parserFawzi Mohamed2013-11-061-2/+2
* qmljs: added qmljsconstants.hFawzi Mohamed2013-10-231-10/+10
* Rename "[Mm]ethod(s)" to "[Ff]unction(s)"Nikolai Kosjar2013-10-101-1/+1
* QmlDesigner.Rewriter: changing Q_ASSERTS to QTC_ASSERTSThomas Hartmann2013-09-191-10/+12
View Lorry Controller Status