summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2010-03-04 11:34:09 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2010-03-04 11:41:33 (GMT)
commit05f6f721408930381eafd02fa4274080694d57e9 (patch)
tree0b4d1564791ea3f1f69d54063278b0c0859ff781
parenta3bc8b9ac990cf07b2b9775a1e281a10a9804086 (diff)
downloadQt-05f6f721408930381eafd02fa4274080694d57e9.zip
Qt-05f6f721408930381eafd02fa4274080694d57e9.tar.gz
Qt-05f6f721408930381eafd02fa4274080694d57e9.tar.bz2
Fix atk warning on startup in Qt apps wit QGtkStyle
While this is acknowledged as a bug in Gtk+ and confirmed fixed upstream, since some distros such as Ubuntu are not backporting this fix and it is easy to work around we should simply fix this for 4.6.3 instead. The problem is simply that atk assumes the button has a label or a labeled icon and spits out a warning if it does not. Additional info can be found here: https://bugs.launchpad.net/ubuntu/+source/gtk+2.0/+bug/484182 Reviewed-by:thorbjorn Task-number: QTBUG-8425
-rw-r--r--src/gui/styles/qgtkstyle_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
index f3c7a5b..ad6746f 100644
--- a/src/gui/styles/qgtkstyle_p.cpp
+++ b/src/gui/styles/qgtkstyle_p.cpp
@@ -530,7 +530,7 @@ void QGtkStylePrivate::initGtkWidgets() const
GtkWidget *gtkButton = QGtkStylePrivate::gtk_button_new();
addWidget(gtkButton);
g_signal_connect(gtkButton, "style-set", G_CALLBACK(gtkStyleSetCallback), 0);
- addWidget(QGtkStylePrivate::gtk_tool_button_new(NULL, NULL));
+ addWidget(QGtkStylePrivate::gtk_tool_button_new(NULL, "Qt"));
addWidget(QGtkStylePrivate::gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE));
addWidget(QGtkStylePrivate::gtk_hbutton_box_new());
addWidget(QGtkStylePrivate::gtk_check_button_new());