diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:55:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 09:55:54 (GMT) |
| commit | 1cfa8d81f04e02860df85a3b7acf41974982adae (patch) | |
| tree | 01282181ab20b7637ceb75d0c26cef15d1d916b5 /src/gui/styles/qgtkstyle.cpp | |
| parent | 934d4b9852060b2870f6774cd854331422147d3e (diff) | |
| parent | eea71824f57dd61b0a513e3bbb5ced99de505d73 (diff) | |
| download | Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.zip Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.tar.gz Qt-1cfa8d81f04e02860df85a3b7acf41974982adae.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2/4.6
Conflicts:
src/s60installs/bwins/QtGuiu.def
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); } |