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 | |
parent | 02afd94ef4c1913735bd650ca93279cfb00dc534 (diff) | |
parent | e4484bb15b29b01dba07cbc31c150153f537606a (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/directfb/qdirectfbconvenience.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 9 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 2 |
3 files changed, 10 insertions, 5 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); diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 7fedc27951..b7ccb5767e 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1586,11 +1586,14 @@ static QStringList extraTryFontsForFamily(const QString& family) break; } } - QStringList fm = QFontDatabase().families(); + QFontDatabase db; + const QStringList families = db.families(); const char **tf = tryFonts; while (tf && *tf) { - if (fm.contains(QLatin1String(*tf))) - result << QLatin1String(*tf); + // QTBUG-31689, family might be an English alias for a localized font name. + const QString family = QString::fromLatin1(*tf); + if (families.contains(family) || db.hasFamily(family)) + result << family; ++tf; } } diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index ca7896995f..b94ca20458 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1397,7 +1397,7 @@ static const char * xcb_atomnames = { #if XCB_USE_MAEMO_WINDOW_PROPERTIES "_MEEGOTOUCH_ORIENTATION_ANGLE\0" #endif - "_XSETTINGS_SETTINGS" + "_XSETTINGS_SETTINGS\0" // \0\0 terminates loop. }; xcb_atom_t QXcbConnection::atom(QXcbAtom::Atom atom) const |