diff options
| author | Andy Shaw <andy.shaw@nokia.com> | 2009-12-03 11:52:53 (GMT) |
|---|---|---|
| committer | Andy Shaw <andy.shaw@nokia.com> | 2009-12-03 11:52:53 (GMT) |
| commit | ad8e34ff448b4e261da65cc5210664f150736bba (patch) | |
| tree | 18a2b59f83fab67984644030e8c1d6d770772eee | |
| parent | 4159207860b68276a6f2f72efec1de0aac620a92 (diff) | |
| parent | d648f23094e61705ceea10b2af526872406d022a (diff) | |
| download | Qt-ad8e34ff448b4e261da65cc5210664f150736bba.zip Qt-ad8e34ff448b4e261da65cc5210664f150736bba.tar.gz Qt-ad8e34ff448b4e261da65cc5210664f150736bba.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b32c55b..9b4d9f8 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); |