diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
| commit | b42da2ec8677ce67ecd5d5f8188537e2a597da2a (patch) | |
| tree | e41b2eb449e0d0392e85603612836d935967f400 /src/gui/styles/qgtkstyle.cpp | |
| parent | 664c78144754c499d07a95c3914fd34202bf4b98 (diff) | |
| parent | 343de9228ae65c36c4a9a45297d45cdeb04a8e44 (diff) | |
| download | Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.zip Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.gz Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/styles/qgtkstyle.cpp')
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b32c55b..afa3325 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -645,6 +645,15 @@ int QGtkStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidg 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, NULL); + } + return underlineShortcut; + } + default: return QCleanlooksStyle::styleHint(hint, option, widget, returnData); } |