diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 11:52:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 11:52:02 (GMT) |
commit | b832dffc1eb85181aa2d99afd1a6c764b634091d (patch) | |
tree | 4e0d73f6ba0b5398c6c9b4d817fdb82b54b6ecad /doc | |
parent | 2344254329a6231dab9daf04fa99823c3c68be49 (diff) | |
parent | 7d861db82b9f8204c2fdc3c12220dd03bdb7b255 (diff) | |
download | Qt-b832dffc1eb85181aa2d99afd1a6c764b634091d.zip Qt-b832dffc1eb85181aa2d99afd1a6c764b634091d.tar.gz Qt-b832dffc1eb85181aa2d99afd1a6c764b634091d.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
The test livelock of QTimer is now expected to work
Make sure mapSelectionFromSource does not return a selection with invalid ranges.
QEventDispatcherUnix: do not process too many timer if other events need to be processed first
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions