diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-20 18:45:43 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-20 18:45:43 (GMT) |
| commit | d63d0c10c0eeef0d2f93f3d0b197e09399087b00 (patch) | |
| tree | 746a1856103d6367f9821a81b7eee25aeb10a7ed /src/gui/styles/gtksymbols.cpp | |
| parent | 435c87186ff54ebfd481e41e07b9a136fbc87a20 (diff) | |
| parent | e90a5e819478b656963de0492a1b234c8863a12b (diff) | |
| download | Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.zip Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.tar.gz Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
Diffstat (limited to 'src/gui/styles/gtksymbols.cpp')
| -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 51f40e3..6a5ea49 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); |