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

6 files changed, 6 insertions, 6 deletions

diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index 21c6fe5..2c26143 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -70,7 +70,7 @@ protected:
                                const QUrl &identifier,
                                const QSourceLocation &sourceLocation) = 0;
 private:
-    Q_DECLARE_PRIVATE(QAbstractMessageHandler)
+    Q_DECLARE_SCOPED_PRIVATE(QAbstractMessageHandler)
     Q_DISABLE_COPY(QAbstractMessageHandler)
 };
 
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index c341ac2c..db545ea 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -64,7 +64,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QAbstractUriResolver)
-    Q_DECLARE_PRIVATE(QAbstractUriResolver)
+    Q_DECLARE_SCOPED_PRIVATE(QAbstractUriResolver)
 };
 
 QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index 1c70159..3098604 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h
@@ -67,7 +67,7 @@ public:
     virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const;
 
 private:
-    Q_DECLARE_PRIVATE(QSimpleXmlNodeModel)
+    Q_DECLARE_SCOPED_PRIVATE(QSimpleXmlNodeModel)
 };
 
 QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index 9bec06d..ca65331 100644
--- a/src/xmlpatterns/api/qxmlformatter.h
+++ b/src/xmlpatterns/api/qxmlformatter.h
@@ -84,7 +84,7 @@ public:
     virtual void item(const QPatternist::Item &item);
 private:
     inline void startFormattingContent();
-    Q_DECLARE_PRIVATE(QXmlFormatter)
+    Q_DECLARE_SCOPED_PRIVATE(QXmlFormatter)
 };
 
 QT_END_NAMESPACE
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index 6fc8d52..ad222ed 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -66,7 +66,7 @@ public:
 
 private:
     friend class QXmlQuery;
-    Q_DECLARE_PRIVATE(QXmlResultItems)
+    Q_DECLARE_SCOPED_PRIVATE(QXmlResultItems)
     QScopedPointer<QXmlResultItemsPrivate> d_ptr;
     Q_DISABLE_COPY(QXmlResultItems)
 };
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index d46a566..2fcc454 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -148,7 +148,7 @@ private:
      */
     inline void write(const QString &content);
 
-    Q_DECLARE_PRIVATE(QXmlSerializer)
+    Q_DECLARE_SCOPED_PRIVATE(QXmlSerializer)
 };
 
 QT_END_NAMESPACE