summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-292-29/+416
|\
| * Optimization: Don't use QVariant in QDeclarativeVMEMetaObjectAaron Kennedy2010-03-292-29/+416
| |
* | Add importPathList, mainly for doc purposes.Warwick Allison2010-03-292-10/+25
|/
* Source resizing for QDeclarativeImageProvider too.Warwick Allison2010-03-284-5/+9
| | | | (fixes test too)
* Recompute the source location of regexp literals.Roberto Raggi2010-03-262-2/+14
| | | | Task-number: QTBUG-9367
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-265-161/+255
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-264-211/+138
| |\
| | * Remove some Script {} docsMartin Jones2010-03-252-89/+0
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-252-122/+138
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| | | * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2533-123/+556
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| | | * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-243-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four-way merge: take the qt-qml.git#4.7 branch version (which uses fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1. Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | | * | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-241-116/+132
| | | | | |
| | | * | | Fix cast-from-ascii warningThiago Macieira2010-03-201-1/+1
| | | | | |
| | | * | | Fix compilation on LinuxThiago Macieira2010-03-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: narrowing conversion of 'point.QPointF::x()' from 'qreal' to 'float' inside { }
| * | | | | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2515-46/+134
|\ \ \ \ \ | |/ / / /
| * | | | Optimize QML "parent" property accessAaron Kennedy2010-03-252-15/+75
| | | | | | | | | | | | | | | | | | | | | | | | | For properties that are as important as "parent", QML cannot afford the overhead of a signal/slot connection.
| * | | | Protect the QDeclarativeListProperty used in QGraphicsItem with ifdefAlexis Menard2010-03-251-0/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Then it fixes the build Reviewed-by:TrustMe
| * | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-252-5/+2
| | | | | | | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-252-4/+4
| |\ \ \
| | * | | Replace Animation's repeat property with loops.Michael Brasser2010-03-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.
| * | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-251-2/+1
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-9336
| * | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-242-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | * | Fix warnings in the declarative moduleThierry Bastian2010-03-233-3/+3
| | |/
| * | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | | | | | | | | | | | Task-number: QTBUG-9312
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-246-4/+40
| |\ \
| | * | Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-246-4/+40
| | | |
| * | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-245-50/+0
| |/ /
| * | Origin safety testing for imported resources.Warwick Allison2010-03-244-12/+44
| | | | | | | | | | | | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion.
* | | Forgot to add a file.Alan Alpert2010-03-251-8/+10
|/ / | | | | | | | | Forgot to add these, the primary changes, to commit 870dbc7542beb07b84378f356cbe568a2ae8b7e1
* | Fix warning.Michael Brasser2010-03-231-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-231-2/+2
|\ \
| * | Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-231-2/+2
| | |
* | | Basic Loader origin safety (for discussion).Warwick Allison2010-03-232-0/+18
|/ /
* | Manual merge.Warwick Allison2010-03-227-9/+81
| |
* | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-221-3/+10
| | | | | | | | Fix failure when import path is ancestor dir of other import path.
* | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| | | | | | | | We're not using it in QmlDesigner any more
* | Deprecate inline Script {} blocksAaron Kennedy2010-03-2218-23/+349
| | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* | Remove dead performance measurement code from QMLAaron Kennedy2010-03-228-31/+2
| |
* | Fix crash when calling createObject on a component with errors.Michael Brasser2010-03-211-0/+2
| |
* | Reduce amount of qmldir parsingmae2010-03-194-34/+38
| | | | | | | | | | This is done by storing the parsed components (QDeclarativeDirComponents). There's still potential for optimization (QT-617)
* | Fix local type lookupmae2010-03-193-15/+24
|/ | | | | | This change removes the hacky final baseUrl+TypeName+".qml" lookup. In order to still support internal files in remote modules, a new qmldir keyword "internal" is introduced.
* Remove warningsYann Bodson2010-03-181-29/+30
|
* Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
|
* Optimize id checking.Warwick Allison2010-03-181-10/+0
| | | | | id must be lowercase; types and namespaces must be uppercase cannot conflict, so remove check.
* Only release the binding once we're finished with its memoryAaron Kennedy2010-03-181-1/+1
|
* Make it harder to accidentally delete a bindingAaron Kennedy2010-03-181-5/+7
|
* Block modifications to internal QDeclarativeContextsAaron Kennedy2010-03-181-1/+19
|
* Another fix to findmae2010-03-171-3/+5
| | | | | Do not try to instantiate types that are explicitely forbidden in the qmldir (because the version does not match).
* Improve implicit "." importmae2010-03-172-16/+28
| | | | | | The change moves the implicit "." import to the very end, i.e. the first lookup. It also gets the content of a remote qmldir from the resources.
generated by cgit v0.12 at 2024-09-24 02:15:33 (GMT)