summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2916-65/+200
|\
| * 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-297-50/+45
| |\ \ | | |/
| | * DocAaron Kennedy2010-03-291-45/+40
| | | | | | | | | | | | QTBUG-7998
| | * Visual test fixes.Michael Brasser2010-03-295-4/+4
| | |
| | * DocAaron Kennedy2010-03-291-1/+1
| | | | | | | | | | | | QTBUG-9273
| * | Ensure currentIndex is updated when PathView items are removed/movedMartin Jones2010-03-292-8/+37
| |/
| * Relayout items when Flow size changes.Martin Jones2010-03-294-0/+103
| | | | | | | | | | | | 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-2948-528/+1083
| |\
| * | 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-299-29/+32
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-29690-318/+475
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2843-151/+399
| |\ \ \ \
| * | | | | Fix change description: Import -> importMartin Jones2010-03-281-1/+1
| | | | | |
* | | | | | docWarwick Allison2010-03-291-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9459 QTBUG-9458
* | | | | | test error code tooWarwick Allison2010-03-291-3/+5
| |_|_|_|/ |/| | | |
* | | | | Optimization: reduce allocationsAaron Kennedy2010-03-292-4/+4
| | | | |
* | | | | Doc.Michael Brasser2010-03-291-0/+5
| | | | |
* | | | | DocAaron Kennedy2010-03-291-2/+1
| | | | |
* | | | | Remove "variant" QML propertiesAaron Kennedy2010-03-293-4/+1
| | | | | | | | | | | | | | | | | | | | "property var a" works just as well
* | | | | Use QDateTime when specifying a "date" property in QMLAaron Kennedy2010-03-295-4/+43
| | | | | | | | | | | | | | | | | | | | QT-718
* | | | | Update examples/declarative.proYann Bodson2010-03-292-2/+7
| | | | |
* | | | | Remove colorbrowser exampleYann Bodson2010-03-295-311/+0
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-291-2/+5
|\ \ \ \ \
| * | | | | Fix for qdeclarativelanguage::listPropertiesAaron Kennedy2010-03-291-2/+5
| | | | | |
* | | | | | docWarwick Allison2010-03-291-0/+4
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-293-6/+25
|\ \ \ \ \
| * | | | | Fix crash in QDeclarativePropertyMap.Michael Brasser2010-03-293-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Import path detail.Warwick Allison2010-03-291-1/+8
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2923-48/+865
|\ \ \ \ \
| * | | | | Add focus and key navigation example.Yann Bodson2010-03-298-0/+209
| | | | | |
| * | | | | Add example on how to use Qt widgets in qml.Yann Bodson2010-03-294-0/+172
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2919-50/+77
| |\ \ \ \ \
| | * | | | | Add missing pro file.Michael Brasser2010-03-291-0/+7
| | | | | | |
| | * | | | | Fix memory leak and clean up deletion.Bea Lam2010-03-291-8/+5
| | | | | | |
| | * | | | | Don't emit QDeclarativePropertyMap::valueChanged() before the value hasMichael Brasser2010-03-295-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed. Task-number: QTBUG-9386
| * | | | | | Optimization: Don't use QVariant in QDeclarativeVMEMetaObjectAaron Kennedy2010-03-294-29/+447
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-29703-342/+516
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-299-29/+32
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Doc fixesBea Lam2010-03-291-5/+13
| | | | | |
| | * | | | Remove references to qmlviewer in docs.Bea Lam2010-03-298-23/+18
| | | | | |
| | * | | | Fix doc linkBea Lam2010-03-291-1/+1
| | |/ / /
| * | | | Fix svg and big image auto tests on win32.Martin Jones2010-03-293-2/+8
| |/ / /
| * | | Run a subset of 'stable' visual tests.Michael Brasser2010-03-282-3/+12
| | | |
| * | | Rename visual test to qmlvisual.Michael Brasser2010-03-28676-24/+17
| | | |
| * | | Syntax and other small fixes for the visual tests.Michael Brasser2010-03-2821-177/+192
| | | |
| * | | Autotest tweaks.Michael Brasser2010-03-285-2/+45
| | | |
| * | | Cleanup.Michael Brasser2010-03-282-30/+8
| | | |
generated by cgit v0.12 at 2024-10-25 13:19:13 (GMT)