summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-10 04:45:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-10 04:45:21 (GMT)
commit9bc46788f3b0f4a652be604d3facbcd84602677a (patch)
tree0f2cb979d736000fd60d85d7a604c1dae373173a /src/multimedia
parent012b28ca212eb4faa0b97f3bf1e3cd84e86de015 (diff)
parentcb1f6d24e0c834d633720102c7e8edc9801196fb (diff)
downloadQt-9bc46788f3b0f4a652be604d3facbcd84602677a.zip
Qt-9bc46788f3b0f4a652be604d3facbcd84602677a.tar.gz
Qt-9bc46788f3b0f4a652be604d3facbcd84602677a.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: (35 commits) Document that Transitions are exclusive. Document TextInput::select(start,end) doc 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 ...
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions