summaryrefslogtreecommitdiff
path: root/src/plugins/phonon/mmf/mmf.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-11 17:28:31 +0100
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-11 17:28:31 +0100
commit7b3880475d02bd3db630387bccccc7e1ef9d4e9a (patch)
treeed35f6c268382b7f0fe16321147c914f3b1b5092 /src/plugins/phonon/mmf/mmf.pro
parenta868f4c9761597abc764c3578b0fffad1fb8177a (diff)
parent4b618e48c909fcc5665e9d60645023c48b2ffb43 (diff)
downloadqt4-tools-7b3880475d02bd3db630387bccccc7e1ef9d4e9a.tar.gz
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/plugins/phonon/mmf/mmf.pro')
0 files changed, 0 insertions, 0 deletions