summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.Michael Brasser2010-03-308-35/+31
|
* Fix viewer resizing on reload and File->openMartin Jones2010-03-301-0/+1
| | | | Task-number: QTBUG-9325
* Don't emit onPositionChanged before onPressedMartin Jones2010-03-301-1/+0
| | | | Task-number: QTBUG-9383
* Make QDeclarativeListProperty a classAaron Kennedy2010-03-301-1/+2
| | | | Apparently structs are not socially acceptable.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-309-75/+56
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
| * Correctly parent repeater items.Michael Brasser2010-03-301-5/+5
| |
| * Make sure cursor delegate is parented.Michael Brasser2010-03-292-0/+4
| | | | | | | | setParentItem no longer sets QObject parent.
| * Allow just one dimension to be set, the other scaled accordinglyWarwick Allison2010-03-291-3/+11
| | | | | | | | Task-number: QTBUG-8984
| * Simplify import path.Warwick Allison2010-03-293-57/+36
| | | | | | | | Reviewed-by: mae
| * Removed unneeded code.Roberto Raggi2010-03-292-10/+0
| |
* | Fix qdeclarativedom::loadDynamicProperty testAaron Kennedy2010-03-301-0/+6
|/
* Improve QML compiler statisticsAaron Kennedy2010-03-292-9/+45
|
* Use error enum not numbersWarwick Allison2010-03-291-2/+2
| | | | (easier to doc)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-291-4/+0
|\
| * QDeclarativeItem::setParentItem should not modify the QObject parentAaron Kennedy2010-03-291-4/+0
| | | | | | | | QTBUG-5768
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-291-45/+40
|\ \ | |/
| * DocAaron Kennedy2010-03-291-45/+40
| | | | | | | | QTBUG-7998
* | Ensure currentIndex is updated when PathView items are removed/movedMartin Jones2010-03-292-8/+37
|/
* Relayout items when Flow size changes.Martin Jones2010-03-291-0/+3
| | | | | | Also add Flow tests. Task-number: QTBUG-9421
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2913-73/+527
|\
| * Optimization: reduce allocationsAaron Kennedy2010-03-292-4/+4
| |
| * Remove "variant" QML propertiesAaron Kennedy2010-03-291-2/+1
| | | | | | | | "property var a" works just as well
| * Use QDateTime when specifying a "date" property in QMLAaron Kennedy2010-03-295-4/+43
| | | | | | | | QT-718
| * Fix for qdeclarativelanguage::listPropertiesAaron Kennedy2010-03-291-2/+5
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-292-6/+9
| |\
| | * Fix crash in QDeclarativePropertyMap.Michael Brasser2010-03-292-6/+9
| | | | | | | | | | | | Task-number: QTBUG-9439
| * | Remove total wrongness.Warwick Allison2010-03-291-1/+0
| |/ | | | | | | Base URL of engine is not what some people think it is.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-297-47/+443
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-295-18/+27
| | |\
| | | * Fix memory leak and clean up deletion.Bea Lam2010-03-291-8/+5
| | | |
| | | * Don't emit QDeclarativePropertyMap::valueChanged() before the value hasMichael Brasser2010-03-294-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | changed. Task-number: QTBUG-9386
| | * | Optimization: Don't use QVariant in QDeclarativeVMEMetaObjectAaron Kennedy2010-03-292-29/+416
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-294-83/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/examples.qdoc doc/src/declarative/focus.qdoc doc/src/declarative/modules.qdoc doc/src/declarative/network.qdoc doc/src/declarative/qdeclarativedebugging.qdoc doc/src/declarative/qdeclarativei18n.qdoc doc/src/declarative/qmlruntime.qdoc doc/src/declarative/tutorial.qdoc tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
| * | Add importPathList, mainly for doc purposes.Warwick Allison2010-03-292-10/+25
| | |
* | | Make sure the image reader thread is shutdown properlyMartin Jones2010-03-291-2/+14
| | | | | | | | | | | | | | | Prevents deadlock on shutdown for very shortlived runs, e.g. autotests
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-294-83/+105
|\ \ \ | | |/ | |/|
| * | Cleanup.Michael Brasser2010-03-282-30/+8
| | |
| * | Don't set status to Ready until model has been created (currently thisBea Lam2010-03-282-53/+97
| |/ | | | | | | | | | | | | | | | | | | is set as soon as XML data is downloaded, so there is no notification when model is actually ready to be used). This also fixes data() to not crash if it is called before the model is ready. Task-number: QTBUG-7835
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2811-20/+54
|\ \ | |/
| * Source resizing for QDeclarativeImageProvider too.Warwick Allison2010-03-285-6/+12
| | | | | | | | (fixes test too)
| * tyopWarwick Allison2010-03-281-1/+1
| |
| * Recompute the source location of regexp literals.Roberto Raggi2010-03-262-2/+14
| | | | | | | | Task-number: QTBUG-9367
| * Adds a way to clear the state list property in QDeclarativeStateGroupKai Koehne2010-03-261-1/+13
| | | | | | | | | | | | | | | | | | Needed by QmlDesigner, which needs to be able to remove states at runtime. Done my Marco Bubke Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-264-57/+281
| |\
| * | I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
| | |
| * | Doc AugmentationAlan Alpert2010-03-261-1/+3
| | | | | | | | | | | | Task-number: QTBUG-9396
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2629-340/+784
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2549-878/+1471
| |\ \ \
| * | | | Forgot to add a file.Alan Alpert2010-03-251-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add these, the primary changes, to commit 870dbc7542beb07b84378f356cbe568a2ae8b7e1
* | | | | Fix change description: Import -> importMartin Jones2010-03-281-1/+1
| |_|_|/ |/| | |