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

4 files changed, 4 insertions, 4 deletions

diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h
index 06ba004..2af1d14 100644
--- a/src/dbus/qdbusabstractadaptor.h
+++ b/src/dbus/qdbusabstractadaptor.h
@@ -66,7 +66,7 @@ protected:
     bool autoRelaySignals() const;
 
 private:
-    Q_DECLARE_PRIVATE(QDBusAbstractAdaptor)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusAbstractAdaptor)
 };
 
 QT_END_NAMESPACE
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h
index e525f77..0d016a3 100644
--- a/src/dbus/qdbusabstractinterface.h
+++ b/src/dbus/qdbusabstractinterface.h
@@ -151,7 +151,7 @@ protected:
                                    const QList<QVariant> &args = QList<QVariant>()) const;
 
 private:
-    Q_DECLARE_PRIVATE(QDBusAbstractInterface)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusAbstractInterface)
     Q_PRIVATE_SLOT(d_func(), void _q_serviceOwnerChanged(QString,QString,QString))
 };
 
diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h
index 9cf36f8..9d0779b 100644
--- a/src/dbus/qdbusinterface.h
+++ b/src/dbus/qdbusinterface.h
@@ -69,7 +69,7 @@ public:
     virtual int qt_metacall(QMetaObject::Call, int, void **);
 
 private:
-    Q_DECLARE_PRIVATE(QDBusInterface)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusInterface)
 };
 
 QT_END_NAMESPACE
diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h
index 8dbbb3c..182cff3 100644
--- a/src/dbus/qdbuspendingcall.h
+++ b/src/dbus/qdbuspendingcall.h
@@ -111,7 +111,7 @@ Q_SIGNALS:
     void finished(QDBusPendingCallWatcher *self);
 
 private:
-    Q_DECLARE_PRIVATE(QDBusPendingCallWatcher)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusPendingCallWatcher)
     Q_PRIVATE_SLOT(d_func(), void _q_finished())
 };