summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Commit message (Expand)AuthorAgeFilesLines
* It's 2011 now.con2011-01-121-1/+1
* License headers.con2010-12-171-7/+11
* QmlDesigner.rewriter: fix possible incompatibilities with import pluginsThomas Hartmann2010-11-261-2/+0
* fix warningsThomas Hartmann2010-10-211-2/+2
* QmlDesigner: support for QtQuick 1.0Thomas Hartmann2010-10-211-14/+25
* QmlDesigner: using Qt 4.7 againThomas Hartmann2010-10-061-31/+9
* Use QCoreApplication::translate instead of QCoreApplication::translateThomas Hartmann2010-10-041-5/+4
* QmlDesigner: compile fixThomas Hartmann2010-10-041-1/+1
* QmlDesigner.rewriter: fix Qt 4.7 importsThomas Hartmann2010-10-041-1/+28
* QmlDesigner: do not allow deprectaed Qt 4.7 imports for BauhausThomas Hartmann2010-10-011-0/+10
* QmlDesigner: using QtQuick 1.0 instead of Qt 4.7Thomas Hartmann2010-10-011-7/+7
* QmlJS: Add initial 'Find Usages' support.Christian Kamm2010-09-241-1/+1
* QmlDesigner: remove annoying warningsThomas Hartmann2010-09-241-0/+1
* QmlDesigner.rewriter: This makes rewriting more robustThomas Hartmann2010-09-201-2/+22
* QmlJS: Add missing null checks before using scopeChain().qmlTypes.Christian Kamm2010-08-301-1/+2
* QmlJS: Refactor LookupContext creation for speed.Christian Kamm2010-08-261-6/+4
* Merge remote branch 'origin/2.0'con2010-06-111-4/+4
|\
| * QmlDesigner: Fix import handling in rewriterKai Koehne2010-06-101-1/+1
| * QmlDesigner: Store imports in a list, not a setKai Koehne2010-06-101-3/+3
* | Merge remote branch 'origin/2.0'con2010-06-101-1/+6
|\ \ | |/
| * Fixed id syncing when and id gets removed from the QML source.Erik Verbruggen2010-06-101-1/+6
* | QmlJS: Use ComponentVersion everywhere.Christian Kamm2010-06-091-4/+4
|/
* Fixed default property discovery for custom QML components.Erik Verbruggen2010-05-311-1/+2
* QmlJS: Generalize EasingCurve name check to all enums.Christian Kamm2010-05-191-2/+0
* QuickDesigner: Rename "core" directory to "designercore"Kai Koehne2010-05-051-0/+1288