Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f

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);