summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-12-03 16:38:14 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-12-03 16:48:28 (GMT)
commite2e0b8d13ba045c693a03c818157f952488c72bd (patch)
tree4b51367f5f9ea141e49a6958ee907ebe21ad14fc
parentae87d2ac8f4ee62de5c9ec59ee575cf3678fa367 (diff)
downloadQt-e2e0b8d13ba045c693a03c818157f952488c72bd.zip
Qt-e2e0b8d13ba045c693a03c818157f952488c72bd.tar.gz
Qt-e2e0b8d13ba045c693a03c818157f952488c72bd.tar.bz2
Fixes: Compile fix
Task: Turns out d648f23094e61705ceea10b2af526872406d022a was not properly applied.
-rw-r--r--src/gui/styles/qgtkstyle.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 9b4d9f8..afa3325 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -644,11 +644,12 @@ 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,
+ g_object_get(settings, "gtk-enable-mnemonics", &underlineShortcut, NULL);
}
return underlineShortcut;
}