summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updates all qml examples/demos to use the easing curve value type syntaxLeonardo Sobral Cunha2010-02-2341-162/+164
|
* Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-237-181/+237
| | | | | | | | Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy
* Add QEasingCurve as builtin metatypeLeonardo Sobral Cunha2010-02-237-11/+285
| | | | | | | | This is needed for qml, in order to be able to use easing as a valuetype. Task-number: QTBUG-8235 Reviewed-by: thierry Reviewed-by: janarve
* Add missing NOTIFY signals to positioners, particles and webviewJoona Petrell2010-02-2312-43/+521
| | | | Reviewed-by: Aaron Kennedy
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2334-279/+616
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2334-252/+383
| |\
| | * QmlExpression API reviewAaron Kennedy2010-02-2315-70/+45
| | |
| | * Make QmlBinding (and friends) privateAaron Kennedy2010-02-2321-178/+169
| | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now.
| * | Doc fix.Bea Lam2010-02-231-2/+2
| | | | | | | | | | | | Task-number: QT-2831
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-232056-71182/+160302
| |\ \
| * | | Add XmlRole::isKey property for incremental data changes when reload()Bea Lam2010-02-232-29/+400
| | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831
* | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-2320-180/+123
| |_|/ |/| | | | | | | | Task-number: QT-2538
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2313-58/+148
|\ \ \ | | |/ | |/|
| * | Doc.Michael Brasser2010-02-231-6/+6
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2310-51/+127
| |\ \
| | * | Fix but in QmlMetaProperty assignment operatorAaron Kennedy2010-02-232-0/+45
| | | | | | | | | | | | | | | | QTBUG-8166
| | * | Cleanup warnings in qmlmetaproperty testAaron Kennedy2010-02-231-11/+11
| | | |
| | * | Rename qmllist autotest to qmllistreferenceAaron Kennedy2010-02-236-23/+23
| | | |
| | * | Small QmlMetaProperty code cleanupAaron Kennedy2010-02-231-16/+16
| | | |
| | * | Better support modelData for object list models.Michael Brasser2010-02-231-1/+1
| | | | | | | | | | | | | | | | modelData will now correctly return the actual object.
| | * | Add documentation on QMLs memory management assumptionsAaron Kennedy2010-02-231-0/+31
| | | |
| * | | Work.Warwick Allison2010-02-231-0/+5
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-231097-72939/+62188
| |\ \
| * | | run qmlmoduleplugin testWarwick Allison2010-02-231-0/+1
| | | |
| * | | Test bug QTBUG-5974Warwick Allison2010-02-231-1/+9
| | | |
* | | | Add support for setting the root index when using a QAbstractItemModel.Martin Jones2010-02-233-4/+169
| |/ / |/| | | | | | | | Task-number: QT-2777
* | | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-225-0/+5
|\ \ \
| * | | Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| | | |
* | | | Documentation UpdateAlan Alpert2010-02-221-1/+5
|/ / / | | | | | | | | | | | | Mention that the same game tutorial is now slightly different to the demo version.
* | | Doc fixAlan Alpert2010-02-221-1/+1
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22947-72470/+61700
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-22268-2665/+2384
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| | * | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-22113-2218/+1931
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2214-27/+157
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Documentation fixes. Add a qRegisterQmlElements function to QtMultimedia
| | * | | | Documentation fixes.Justin McPherson2010-02-227-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Nicholas Young
| | * | | | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-227-9/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid exposing private classes. Reviewed-by: Bill King
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-221-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-211-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-211-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| | | | * | | | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-2117-553/+204
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Revert "Factored readRegistryKey implementation out of qmake" Revert "Factored epocRoot implementation out of qmake"
| | * | | | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-219-258/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. Conflicts: qmake/Makefile.unix
| | * | | | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2113-297/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-21302-68221/+34221
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for symbian license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-20302-68221/+34221
| | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for symbian license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20356-6032/+7175
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-20302-68220/+34223
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| | * | | | | | | | Compile fix for symbianaavit2010-02-201-5/+2
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trust me
| | * | | | | | | Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/legal/3rdparty.qdoc