summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update test numbers after change to default transformOrigin.Michael Brasser2010-02-251-6/+4
| | | | Also make one comparison a bit more fuzzy.
* Protect against double initialization.Roberto Raggi2010-02-252-6/+20
|
* Compile on Linux: close(2) is defined in #include <unistd.h>Thiago Macieira2010-02-251-0/+1
| | | | | Reviewed-by: Trust Me (cherry picked from commit 513395fa2e4ee8564a202a38584e1887c08f91db)
* Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
|
* Fix compilation: intptr_t -> quintptrThiago Macieira2010-02-251-2/+2
|
* Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-252203-140276/+143703
|\ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
| * Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
| |
| * Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-2514-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 -> QDeclarativePropertyAaron Kennedy2010-02-2553-520/+519
| | | | | | | | There's nothing meta about our properties.
| * Introduced alternative syntax for defining QML bindings.Roberto Raggi2010-02-257-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-qmlJustin McPherson2010-02-254-12/+81
| |\
| | * Document and test resetting properties in a state change.Michael Brasser2010-02-253-1/+69
| | | | | | | | | | | | Task-number: QT-1817
| | * Handle smooth reparenting where the item being reparented has a complexMichael Brasser2010-02-251-11/+12
| | | | | | | | | | | | | | | | | | transform. Fixes pathview <-> details transition in flickr demo.
| * | Fix up some rename confusion.Justin McPherson2010-02-254-135/+3
| |/
| * Make more private QDeclarativeMetaProperty methods privateAaron Kennedy2010-02-2516-89/+95
| |
| * docWarwick Allison2010-02-251-3/+1
| |
| * Fix documentation following MouseRegion -> MouseArea changeMartin Jones2010-02-251-9/+9
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-252-2/+5
| |\
| | * Recfactor in declarative snake demoLeonardo Sobral Cunha2010-02-251-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 stoppedLeonardo Sobral Cunha2010-02-251-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 Jones2010-02-252-0/+79
| | |
| * | Document PackageMartin Jones2010-02-253-0/+55
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2558-990/+630
| |\ \ | | |/
| | * Tweak QDeclarativeMetaProperty type category APIAaron Kennedy2010-02-256-47/+45
| | |
| | * Remove QDeclarativeMetaProperty::AttachedAaron Kennedy2010-02-253-40/+13
| | | | | | | | | | | | | | | We now prohibit QDeclarativeMetaProperty ever getting into a state where it is pointing to the attached object itself.
| | * Remove QDeclarativeMetaProperty::createProperty() methodAaron Kennedy2010-02-257-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-qmlYann Bodson2010-02-2518-130/+155
| | |\
| | | * Add import Qt.widgets 4.6 to loader auto test using graphics widgetsJoona Petrell2010-02-251-0/+1
| | | |
| | | * Move private QDeclarativeMetaProperty functions into the private classAaron Kennedy2010-02-2512-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-qmlWarwick Allison2010-02-251-2/+2
| | | |\
| | | * | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-254-25/+25
| | | | | | | | | | | | | | | | | | | | Fix multimedia plugin.
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2537-648/+316
| | | |\ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2466-495/+1248
| | | |\ \ \
| | | * | | | Uses Qt.widgetsWarwick Allison2010-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (still doesn't work yet...)
| | * | | | | Connections example could be turned incorrectlyYann Bodson2010-02-251-8/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Task-number: QTBUG-8345
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-2537-648/+316
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView"Aaron Kennedy2010-02-254-584/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5.
| | | * | | Fix include of renamed headerJustin McPherson2010-02-252-2/+2
| | | | | |
| | | * | | Change Multimedia declarative module in line with recent commits.Justin McPherson2010-02-253-9/+14
| | | | | |
| | | * | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-2432-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 reversedYann Bodson2010-02-251-2/+2
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-8180
| * | | | React to QAbstractItemModel::modelReset() signal.Martin Jones2010-02-2516-1/+323
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-8494
| * | | Install the extensions in the given uri.Roberto Raggi2010-02-241-7/+6
| | | | | | | | | | | | | | | | Reviewed-by: mae
| * | | Install the QML extensions.Roberto Raggi2010-02-244-5/+16
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-247-10/+62
| |\ \ \
| | * | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-247-10/+62
| | | | |
| * | | | Fix building without the XmlPatterns ModuleAlan Alpert2010-02-241-0/+2
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-241-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Build fix when using <QtDeclarative> include.Alexis Menard2010-02-241-0/+3
| | | | |
| * | | | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlViewAlan Alpert2010-02-244-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