diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:59 +0200 |
commit | 1190863fc0855ef25e7239e35da3978f317638bd (patch) | |
tree | 92c408f7c53f194639d2a10b82f5c90a85704776 /src/plugins/platforms/directfb | |
parent | 02afd94ef4c1913735bd650ca93279cfb00dc534 (diff) | |
parent | e4484bb15b29b01dba07cbc31c150153f537606a (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
Diffstat (limited to 'src/plugins/platforms/directfb')
-rw-r--r-- | src/plugins/platforms/directfb/qdirectfbconvenience.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp index b6db830f82..5b4c958616 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp @@ -299,12 +299,14 @@ QDirectFbKeyMap::QDirectFbKeyMap() insert(DIKS_VOLUME_UP , Qt::Key_VolumeUp); insert(DIKS_VOLUME_DOWN , Qt::Key_VolumeDown); insert(DIKS_MUTE , Qt::Key_VolumeMute); - insert(DIKS_PLAYPAUSE , Qt::Key_Pause); + insert(DIKS_PLAYPAUSE , Qt::Key_MediaTogglePlayPause); insert(DIKS_PLAY , Qt::Key_MediaPlay); insert(DIKS_STOP , Qt::Key_MediaStop); insert(DIKS_RECORD , Qt::Key_MediaRecord); insert(DIKS_PREVIOUS , Qt::Key_MediaPrevious); insert(DIKS_NEXT , Qt::Key_MediaNext); + insert(DIKS_REWIND , Qt::Key_AudioRewind); + insert(DIKS_FASTFORWARD , Qt::Key_AudioForward); insert(DIKS_F1 , Qt::Key_F1); insert(DIKS_F2 , Qt::Key_F2); |