diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 04:59:41 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 04:59:41 (GMT) |
commit | fe6748f91f94746f2f81b448df7c094b306c865d (patch) | |
tree | 58a0228291ece834704f4e8b292b6d6c509b0b31 /src/gui/image | |
parent | d7a00eaec6d94fd2383d6f815f792d26b7161f0c (diff) | |
parent | 818d3e56bda4829398ceb633a7271c5c99fcdbda (diff) | |
download | Qt-fe6748f91f94746f2f81b448df7c094b306c865d.zip Qt-fe6748f91f94746f2f81b448df7c094b306c865d.tar.gz Qt-fe6748f91f94746f2f81b448df7c094b306c865d.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:
Fix TextInput auto test failure on mac.
Fix word selection locking on string boundaries.
Fix potential crash in QTextControl.
QDeclarativePropertyMap::keys() cannot be called from qml
Compensate for horizontal scroll in TextInput micro focus.
Diffstat (limited to 'src/gui/image')
0 files changed, 0 insertions, 0 deletions