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, 7 insertions, 7 deletions

diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h
index 9190d54..e91a21e 100644
--- a/tools/designer/src/lib/shared/iconselector_p.h
+++ b/tools/designer/src/lib/shared/iconselector_p.h
@@ -88,7 +88,7 @@ public:
 
 private:
     QScopedPointer<class LanguageResourceDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(LanguageResourceDialog)
+    Q_DECLARE_SCOPED_PRIVATE(LanguageResourceDialog)
     Q_DISABLE_COPY(LanguageResourceDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAccepted())
     Q_PRIVATE_SLOT(d_func(), void slotPathChanged(QString))
@@ -121,7 +121,7 @@ signals:
     void iconChanged(const PropertySheetIconValue &icon);
 private:
     QScopedPointer<class IconSelectorPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(IconSelector)
+    Q_DECLARE_SCOPED_PRIVATE(IconSelector)
     Q_DISABLE_COPY(IconSelector)
 
     Q_PRIVATE_SLOT(d_func(), void slotStateActivated())
diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
index 6eac2b8..59c5ca6 100644
--- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
+++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
@@ -85,7 +85,7 @@ private:
     ~QtResourceEditorDialog();
 
     QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceEditorDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceEditorDialog)
     Q_DISABLE_COPY(QtResourceEditorDialog)
 
     Q_PRIVATE_SLOT(d_func(), void slotQrcFileInserted(QtQrcFile *))
diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h
index e9f1c93..22e98bb 100644
--- a/tools/designer/src/lib/shared/qtresourcemodel_p.h
+++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h
@@ -89,7 +89,7 @@ private:
     friend class QtResourceModel;
 
     QScopedPointer<class QtResourceSetPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceSet)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceSet)
     Q_DISABLE_COPY(QtResourceSet)
 };
 
@@ -134,7 +134,7 @@ private:
     friend class QtResourceSet;
 
     QScopedPointer<class QtResourceModelPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceModel)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceModel)
     Q_DISABLE_COPY(QtResourceModel)
 
     Q_PRIVATE_SLOT(d_func(), void slotFileChanged(const QString &))
diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h
index 0484686..82bb8d8 100644
--- a/tools/designer/src/lib/shared/qtresourceview_p.h
+++ b/tools/designer/src/lib/shared/qtresourceview_p.h
@@ -103,7 +103,7 @@ protected:
 private:
 
     QScopedPointer<class QtResourceViewPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceView)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceView)
     Q_DISABLE_COPY(QtResourceView)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *))
     Q_PRIVATE_SLOT(d_func(), void slotCurrentPathChanged(QTreeWidgetItem *))
@@ -131,7 +131,7 @@ public:
 
 private:
     QScopedPointer<class QtResourceViewDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtResourceViewDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtResourceViewDialog)
     Q_DISABLE_COPY(QtResourceViewDialog)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &))
 };