Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update test numbers after change to default transformOrigin. | Michael Brasser | 2010-02-25 | 1 | -6/+4 |
| | | | | Also make one comparison a bit more fuzzy. | ||||
* | Protect against double initialization. | Roberto Raggi | 2010-02-25 | 2 | -6/+20 |
| | |||||
* | Compile on Linux: close(2) is defined in #include <unistd.h> | Thiago Macieira | 2010-02-25 | 1 | -0/+1 |
| | | | | | Reviewed-by: Trust Me (cherry picked from commit 513395fa2e4ee8564a202a38584e1887c08f91db) | ||||
* | Fix compilation due to enabling of QStringBuilder throughout | Thiago Macieira | 2010-02-25 | 1 | -1/+1 |
| | |||||
* | Fix compilation: intptr_t -> quintptr | Thiago Macieira | 2010-02-25 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 2203 | -140276/+143703 |
|\ | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp | ||||
| * | Don't look for contextual keywords when defining properties. | Roberto Raggi | 2010-02-25 | 3 | -632/+658 |
| | | |||||
| * | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 14 | -35/+45 |
| | | | | | | | | | | | | 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 | 53 | -520/+519 |
| | | | | | | | | There's nothing meta about our properties. | ||||
| * | Introduced alternative syntax for defining QML bindings. | Roberto Raggi | 2010-02-25 | 7 | -1000/+1072 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is possible to define bindings using the `on' context keyword. For example, you can write Behavior on opacity { NumberAnimation { duration: 500 } } instead of opacity: Behavior { NumberAnimation { duration: 500 } } | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Justin McPherson | 2010-02-25 | 4 | -12/+81 |
| |\ | |||||
| | * | Document and test resetting properties in a state change. | Michael Brasser | 2010-02-25 | 3 | -1/+69 |
| | | | | | | | | | | | | Task-number: QT-1817 | ||||
| | * | Handle smooth reparenting where the item being reparented has a complex | Michael Brasser | 2010-02-25 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | transform. Fixes pathview <-> details transition in flickr demo. | ||||
| * | | Fix up some rename confusion. | Justin McPherson | 2010-02-25 | 4 | -135/+3 |
| |/ | |||||
| * | Make more private QDeclarativeMetaProperty methods private | Aaron Kennedy | 2010-02-25 | 16 | -89/+95 |
| | | |||||
| * | doc | Warwick Allison | 2010-02-25 | 1 | -3/+1 |
| | | |||||
| * | Fix documentation following MouseRegion -> MouseArea change | Martin Jones | 2010-02-25 | 1 | -9/+9 |
| | | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-25 | 2 | -2/+5 |
| |\ | |||||
| | * | Recfactor in declarative snake demo | Leonardo Sobral Cunha | 2010-02-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Avoid having 2 'states' that have 'when' conditions that can be 'true' at the same time. | ||||
| | * | Fix QDeclarativePropertyAnimation to avoid property writes while stopped | Leonardo Sobral Cunha | 2010-02-25 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid changing the value of the property, while the animation is stopped. This was triggered while changing the duration of the animation, while it was stopped. Task-number: QTBUG-8507 Reviewed-by: Michael Brasser | ||||
| * | | Add simple Package example. | Martin Jones | 2010-02-25 | 2 | -0/+79 |
| | | | |||||
| * | | Document Package | Martin Jones | 2010-02-25 | 3 | -0/+55 |
| | | | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-25 | 58 | -990/+630 |
| |\ \ | | |/ | |||||
| | * | Tweak QDeclarativeMetaProperty type category API | Aaron Kennedy | 2010-02-25 | 6 | -47/+45 |
| | | | |||||
| | * | Remove QDeclarativeMetaProperty::Attached | Aaron Kennedy | 2010-02-25 | 3 | -40/+13 |
| | | | | | | | | | | | | | | | We now prohibit QDeclarativeMetaProperty ever getting into a state where it is pointing to the attached object itself. | ||||
| | * | Remove QDeclarativeMetaProperty::createProperty() method | Aaron Kennedy | 2010-02-25 | 7 | -126/+106 |
| | | | | | | | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors. | ||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Yann Bodson | 2010-02-25 | 18 | -130/+155 |
| | |\ | |||||
| | | * | 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 | 12 | -105/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | |\ | |||||
| | | * | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now). | Warwick Allison | 2010-02-25 | 4 | -25/+25 |
| | | | | | | | | | | | | | | | | | | | | Fix multimedia plugin. | ||||
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-25 | 37 | -648/+316 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 66 | -495/+1248 |
| | | |\ \ \ | |||||
| | | * | | | | Uses Qt.widgets | Warwick Allison | 2010-02-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (still doesn't work yet...) | ||||
| | * | | | | | Connections example could be turned incorrectly | Yann Bodson | 2010-02-25 | 1 | -8/+4 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Task-number: QTBUG-8345 | ||||
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Yann Bodson | 2010-02-25 | 37 | -648/+316 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView" | Aaron Kennedy | 2010-02-25 | 4 | -584/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5. | ||||
| | | * | | | Fix include of renamed header | Justin McPherson | 2010-02-25 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Change Multimedia declarative module in line with recent commits. | Justin McPherson | 2010-02-25 | 3 | -9/+14 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 32 | -64/+309 |
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | QML Text item clipping logic was reversed | Yann Bodson | 2010-02-25 | 1 | -2/+2 |
| | |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-8180 | ||||
| * | | | | React to QAbstractItemModel::modelReset() signal. | Martin Jones | 2010-02-25 | 16 | -1/+323 |
| |/ / / | | | | | | | | | | | | | Task-number: QTBUG-8494 | ||||
| * | | | Install the extensions in the given uri. | Roberto Raggi | 2010-02-24 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | Reviewed-by: mae | ||||
| * | | | Install the QML extensions. | Roberto Raggi | 2010-02-24 | 4 | -5/+16 |
| | | | | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 7 | -10/+62 |
| |\ \ \ | |||||
| | * | | | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 7 | -10/+62 |
| | | | | | |||||
| * | | | | Fix building without the XmlPatterns Module | Alan Alpert | 2010-02-24 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Build fix when using <QtDeclarative> include. | Alexis Menard | 2010-02-24 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView | Alan Alpert | 2010-02-24 | 4 | -2/+584 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could use to be renamed. Possibly to -QDeclarativeViewGraphicsWidget -QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n) But those aren't any shorter. Task-number: QTBUG-7067 |