Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 6 | -0/+269 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 2 | -18/+18 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 32 | -82/+2014 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp | |||||
| * | | | | | | | | | Automatically connect to signals "onFooChanged" if property is "foo". | Bea Lam | 2010-02-25 | 3 | -17/+218 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work for PropertyChanges and QDeclarativeMetaProperty as well. Task-number: QT-2783 | |||||
* | | | | | | | | | | Renamed Flickable viewportXXX properties contentXXX | Martin Jones | 2010-02-26 | 8 | -44/+43 | |
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at. | |||||
* | | | | | | | | | Update test numbers after change to default transformOrigin. | Michael Brasser | 2010-02-25 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make one comparison a bit more fuzzy. | |||||
* | | | | | | | | | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 1312 | -29989/+31337 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp | |||||
| * | | | | | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 4 | -8/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context. | |||||
| * | | | | | | | | Rename QDeclarativeMetaProperty -> QDeclarativeProperty | Aaron Kennedy | 2010-02-25 | 9 | -203/+203 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's nothing meta about our properties. | |||||
| * | | | | | | | | Document and test resetting properties in a state change. | Michael Brasser | 2010-02-25 | 2 | -0/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1817 | |||||
| * | | | | | | | | Make more private QDeclarativeMetaProperty methods private | Aaron Kennedy | 2010-02-25 | 2 | -12/+13 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-25 | 8 | -89/+107 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Tweak QDeclarativeMetaProperty type category API | Aaron Kennedy | 2010-02-25 | 2 | -18/+18 | |
| | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Remove QDeclarativeMetaProperty::createProperty() method | Aaron Kennedy | 2010-02-25 | 2 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors. | |||||
| | * | | | | | Add import Qt.widgets 4.6 to loader auto test using graphics widgets | Joona Petrell | 2010-02-25 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | Move private QDeclarativeMetaProperty functions into the private class | Aaron Kennedy | 2010-02-25 | 2 | -56/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to allow manipulation of bindings and signal properties through the public API. Equivalents of the public functions now exist in QDeclarativeMetaPropertyPrivate for internal use. | |||||
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-25 | 2 | -1/+14 | |
| | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 2 | -1/+14 | |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri src/multimedia/qml/qmlaudio_p.h src/multimedia/qml/qmlgraphicsvideo_p.h src/multimedia/qml/qmlmediabase_p.h src/plugins/qmlmodules/multimedia/multimedia.cpp | |||||
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 13 | -3/+59 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | * | | | | | | Uses Qt.widgets | Warwick Allison | 2010-02-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (still doesn't work yet...) | |||||
| * | | | | | | | React to QAbstractItemModel::modelReset() signal. | Martin Jones | 2010-02-25 | 6 | -0/+269 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8494 | |||||
| * | | | | | | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 3 | -3/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-24 | 9 | -1/+6 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fixup tests after QDeclarative class renames | Aaron Kennedy | 2010-02-24 | 4 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 5 | -0/+5 | |
| | |/ / / / / | ||||||
| * | | | | | | Don't crash if the currentIndex is set while creating a delegate. | Martin Jones | 2010-02-24 | 2 | -0/+48 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8456 | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 5 | -6/+41 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 2 | -6/+12 | |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images). | |||||
| | * | | | | Make compile following renaming of class. | Bea Lam | 2010-02-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-24 | 61 | -892/+892 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Automatically connect to a notify signal if the requested signal is | Bea Lam | 2010-02-24 | 3 | -0/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the "onFooChanged" form, even if the notify signal is not called "fooChanged". Task-number: QT-2783 | |||||
| * | | | | | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779 | Warwick Allison | 2010-02-24 | 2 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 61 | -892/+892 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX ↵ | Leonardo Sobral Cunha | 2010-02-24 | 60 | -891/+891 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to QDeclarativeXXX. | |||||
| | * | | | | | Fix declarative failing auto-test, missing rename of the test file | Leonardo Sobral Cunha | 2010-02-24 | 2 | -1/+1 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 11 | -0/+1852 | |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | | | | | | Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp | |||||
| * | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 1171 | -3380/+3383 | |
| | | | | | | | | | | | | | | | | | | | | QDeclarativeXXX. | |||||
| * | | | | Fix positioner auto test with new easing curve syntax | Joona Petrell | 2010-02-24 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 9 | -6/+59 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.h | |||||
| | * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-24 | 8 | -2/+161 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 5 | -2/+55 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp | |||||
| | * | | | | | | Fix expected errors following d43ec1bdb12649c32f0f0067492857a70bef05b4 | Bea Lam | 2010-02-24 | 3 | -3/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Disallow ids that start with upper case letters. | Bea Lam | 2010-02-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2786 | |||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 3 | -0/+106 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 1 | -0/+13 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 22 | -114/+622 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Fix illegal access in QmlStyledText and add auto tests | Martin Jones | 2010-02-23 | 3 | -0/+106 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Compile after 20fc9f2e264f34dd8580949ddbe5511b78ab0ac4 | Warwick Allison | 2010-02-23 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 1 | -0/+13 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 32 | -255/+702 | |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | |