diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 15:03:47 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 15:03:47 (GMT) |
commit | 73b5555277b2d5a6f752f44062b1a87e69abe756 (patch) | |
tree | b6aa305a4821c4bd3305cce8d3b5a4b3985a3220 /qmake | |
parent | 3555687f5ff270c61499a5597444895bec0d70fb (diff) | |
parent | 0531b97863f93c5a141bd9ef0b58bcf6282024e7 (diff) | |
download | Qt-73b5555277b2d5a6f752f44062b1a87e69abe756.zip Qt-73b5555277b2d5a6f752f44062b1a87e69abe756.tar.gz Qt-73b5555277b2d5a6f752f44062b1a87e69abe756.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Manipulate buffer position via 'pPos' in peek()
No more enter & leave events after a popup menu is closed on Windows
Child windows shown automatically when their parent is shown(Cocoa).
QKeyEvent::text() inconsistency between Linux and Mac
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions