diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 20:38:55 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 20:38:55 (GMT) |
commit | ffd14464a6c5158c1b88b9cfa51e44507fb557f9 (patch) | |
tree | d7f956118cbbe5870470831a51bf034887b5c17c /doc/src/snippets/declarative/parallelanimation.qml | |
parent | 74d391adfd907d80ae35abe25fe346b2b4d649f9 (diff) | |
parent | 72fd8399aa36395e41f497fff79842496d6f9b03 (diff) | |
download | Qt-ffd14464a6c5158c1b88b9cfa51e44507fb557f9.zip Qt-ffd14464a6c5158c1b88b9cfa51e44507fb557f9.tar.gz Qt-ffd14464a6c5158c1b88b9cfa51e44507fb557f9.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Some 4.7.1 changes.
Fix QScriptEngine::abortEvaluation.
QAxBase::dynamicCall() returns invalid QVariant
Fixes cursor shape when widget becomes native on X11.
Update changes
Diffstat (limited to 'doc/src/snippets/declarative/parallelanimation.qml')
0 files changed, 0 insertions, 0 deletions