Merge commit 'origin/master'

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/kernel/qmetatype.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/itemviews/qheaderview.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qgesture.h
	src/gui/kernel/qgesturerecognizer.h
	src/gui/painting/qpaintengine_raster.cpp
	src/network/access/qhttpnetworkreply.cpp
	src/network/access/qnetworkcookie.h
	src/network/socket/qnativesocketengine_unix.cpp

1 files changed, 2 insertions, 8 deletions

diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 519e02e..97cbecc 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -230,7 +230,7 @@ struct QGradientBrushData : public QBrushData
     QGradient gradient;
 };
 
-struct QBrushDataPointerHandler
+struct QBrushDataPointerDeleter
 {
     static inline void deleteData(QBrushData *d)
     {
@@ -254,12 +254,6 @@ struct QBrushDataPointerHandler
             deleteData(d);
         }
     }
-
-    static inline void reset(QBrushData *&d, QBrushData *other)
-    {
-        cleanup(d);
-        d = other;
-    }
 };
 
 /*!
@@ -580,7 +574,7 @@ QBrush::~QBrush()
 
 void QBrush::cleanUp(QBrushData *x)
 {
-    QBrushDataPointerHandler::deleteData(x);
+    QBrushDataPointerDeleter::deleteData(x);
 }