diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 17:28:31 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 17:28:31 +0100 |
| commit | 7b3880475d02bd3db630387bccccc7e1ef9d4e9a (patch) | |
| tree | ed35f6c268382b7f0fe16321147c914f3b1b5092 /src/gui/text/qfontengine_mac.mm | |
| parent | a868f4c9761597abc764c3578b0fffad1fb8177a (diff) | |
| parent | 4b618e48c909fcc5665e9d60645023c48b2ffb43 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).
Fix restore of maximized window geometry on Windows
Remove qDebug.
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
0 files changed, 0 insertions, 0 deletions