diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 04:37:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 04:37:02 (GMT) |
| commit | 4cf3730c65b28f3e895a1a4c8f7db509e11c71c0 (patch) | |
| tree | 138a0312bcf5dedc57b51387437cd5c94862f15c /src/gui/text/qtextdocument_p.h | |
| parent | 0de5087cf17e1c1c37da166b2f531525b9060d71 (diff) | |
| parent | 8f03609a5767e8cabc09bb18ce1622ebd66518cb (diff) | |
| download | Qt-4cf3730c65b28f3e895a1a4c8f7db509e11c71c0.zip Qt-4cf3730c65b28f3e895a1a4c8f7db509e11c71c0.tar.gz Qt-4cf3730c65b28f3e895a1a4c8f7db509e11c71c0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fix s60main linking issue with gcce applications
don't complain multiple times about same abuse of //% meta strings
Fixed device context leak in QGLWidget on Windows.
Provide Qml plugins with UID3s on Symbian
Fix "missing store_build" errors
Updated UIDs for spectrum demo
Assigning 0xA UID3s to the new standalone qml demos
Update 4.7-beta2 def files
Fix a possible crash with the EVR video renderer in windows
Stopping a flick resulted in the next click being consumed.
clearFocus() shouldn't mess with focus if it doesn't have focus
Fixed infinite recursion when drawing very large painter paths.
Fix autoScroll implementation
Diffstat (limited to 'src/gui/text/qtextdocument_p.h')
0 files changed, 0 insertions, 0 deletions