Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index b32c55b337..9b4d9f83cf 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -644,6 +644,14 @@ int QGtkStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidg
         static bool buttonsHaveIcons = d->getGConfBool(QLS("/desktop/gnome/interface/buttons_have_icons"));
         return buttonsHaveIcons;
     }
+    case SH_UnderlineShortcut: {
+        gboolean underlineShortcut = true;
+        if (!d->gtk_check_version(2, 12, 0)) {
+            GtkSettings *settings = d->gtk_settings_get_default();
+            g_object_get(settings, "gtk-enable-mnemonics", &underlineShortcut,
+        }
+        return underlineShortcut;
+    }
 
     default:
         return QCleanlooksStyle::styleHint(hint, option, widget, returnData);