diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-20 16:58:58 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-20 16:58:58 +0200 |
| commit | 851a858fcd28c35dff2ffbeffdb40f7ee69f45b4 (patch) | |
| tree | f76f604982f127af7ef66d904038cdfa705ff3af /src/gui/styles | |
| parent | efea248b4b725ca429793874eb168ad4b43c7994 (diff) | |
| parent | c0b24b7ce12387aff6e74b05b4060c61a58d87e0 (diff) | |
| download | qt4-tools-851a858fcd28c35dff2ffbeffdb40f7ee69f45b4.tar.gz | |
Merge commit 'qt/master'
Conflicts:
examples/painting/svgviewer/files/bubbles.svg
src/corelib/kernel/qobject.cpp
src/network/kernel/qhostinfo.cpp
tests/auto/qhostinfo/tst_qhostinfo.cpp
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/gtksymbols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index 51f40e3a5e..6a5ea49ea8 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -642,7 +642,7 @@ GtkStyle* QGtk::gtkStyle(const QString &path) return 0; } -static void update_toolbar_style(GtkWidget *gtkToolBar, GParamSpec *pspec, gpointer user_data) +static void update_toolbar_style(GtkWidget *gtkToolBar, GParamSpec *, gpointer) { GtkToolbarStyle toolbar_style = GTK_TOOLBAR_ICONS; g_object_get(gtkToolBar, "toolbar-style", &toolbar_style, NULL); |