diff options
| author | Bill King <bill.king@nokia.com> | 2009-12-03 22:22:49 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-12-03 22:22:49 (GMT) |
| commit | a2eda737c58434ee2604b6466dcf3212a35b604f (patch) | |
| tree | 76ba6e2b1b192e6d2dc1aede3ca7072993b32402 /src/gui/styles/qgtkstyle_p.cpp | |
| parent | 1b4ff1bab4ccc4bdc403b84920314f76fbca02c5 (diff) | |
| parent | 68f4b46426e715540864046128617250a521d38a (diff) | |
| download | Qt-a2eda737c58434ee2604b6466dcf3212a35b604f.zip Qt-a2eda737c58434ee2604b6466dcf3212a35b604f.tar.gz Qt-a2eda737c58434ee2604b6466dcf3212a35b604f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/styles/qgtkstyle_p.cpp')
| -rw-r--r-- | src/gui/styles/qgtkstyle_p.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp index 5f4ebae..22dfc62 100644 --- a/src/gui/styles/qgtkstyle_p.cpp +++ b/src/gui/styles/qgtkstyle_p.cpp @@ -202,8 +202,12 @@ Ptr_gnome_vfs_init QGtkStylePrivate::gnome_vfs_init = 0; typedef int (*x11ErrorHandler)(Display*, XErrorEvent*); +QT_END_NAMESPACE + Q_DECLARE_METATYPE(QGtkStylePrivate*); +QT_BEGIN_NAMESPACE + static void gtkStyleSetCallback(GtkWidget*) { qRegisterMetaType<QGtkStylePrivate *>(); |