diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 08:40:40 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 08:40:40 (GMT) |
commit | 4068aab604b566b33cb8caf360b328232d12ba46 (patch) | |
tree | dbe36b2c18b0acca063f5c679c71f3017188bace /src/declarative/graphicsitems/qdeclarativeevents.cpp | |
parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
parent | 4c4734cae65b7c5907dc786e02b13b020eb22aaf (diff) | |
download | Qt-4068aab604b566b33cb8caf360b328232d12ba46.zip Qt-4068aab604b566b33cb8caf360b328232d12ba46.tar.gz Qt-4068aab604b566b33cb8caf360b328232d12ba46.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow overloaded methods, and methods with default params, to be called in QML
Keep qmlviewer from disappearing
Update some tests to modern syntax
Additional autotests for VisualDataModel.
Actually call update in the Text Element
Snake demo now pauses when the window loses focus.
Recalculate Text Element's alignment when width changes
Fix potential memory corruption in QDeclarativePropertyCache
Correctly splice properties from derived metaobjects together
Fix consistency of setting currentIndex in ListView and GridView.
Optimization: Don't generate intermediate QDeclarativeComponent's
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeevents.cpp')
0 files changed, 0 insertions, 0 deletions