diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 06:39:30 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 06:39:30 (GMT) |
commit | 83a48659bd8a4b9dc1f0c77189bd60d91b875c4d (patch) | |
tree | ac7c03a6407124dfc1591e6f15f6bcddafa2c637 /doc/src/snippets/statemachine | |
parent | 3d2504305fa39903ab680d7199cb4bb5427167e8 (diff) | |
parent | 736a73ac2d05bcc811ee8eaeb6aa7a026d6b018a (diff) | |
download | Qt-83a48659bd8a4b9dc1f0c77189bd60d91b875c4d.zip Qt-83a48659bd8a4b9dc1f0c77189bd60d91b875c4d.tar.gz Qt-83a48659bd8a4b9dc1f0c77189bd60d91b875c4d.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: (32 commits)
Fix Text::elide docs.
Fix Rectangle painting at small sizes.
Fix QML ecmascript autotest.
Fix QtQuick import.
Export QDeclarativeDebugHelper on Symbian for QTBUG-13762
Don't use stdint.h in our headers since it is a C99 header.
Text alignment is broken with multi-line text and implicit size.
Update QtOpenVg def files for bug QT-3589
Image bounding rect should always include the area being painted
Fix minehunt.pro (minehunt is no longer a plugin)
Don't allow flagging of flipped tiles in Minehunt
Remove Snake demo from QtDemo
Fix samegame text input focus
Whitespace fixes
Update visual tests for Mac.
Run all QML visual tests now.
Make qmlvisual tests more stable
Add documentation about script evaluation context and allowed types
Maintain passing visualtests on X11
Fix errors in example code. Also reverts the example code to the old
...
Diffstat (limited to 'doc/src/snippets/statemachine')
0 files changed, 0 insertions, 0 deletions