Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

17 files changed, 55 insertions, 55 deletions

diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h
index 0348998fa..5f34815f0 100644
--- a/tools/shared/qtgradienteditor/qtcolorbutton.h
+++ b/tools/shared/qtgradienteditor/qtcolorbutton.h
@@ -76,7 +76,7 @@ protected:
 #endif
 private:
     QScopedPointer<class QtColorButtonPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtColorButton)
+    Q_DECLARE_SCOPED_PRIVATE(QtColorButton)
     Q_DISABLE_COPY(QtColorButton)
     Q_PRIVATE_SLOT(d_func(), void slotEditColor())
 };
diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h
index ffd3eea27..f54ec70f3 100644
--- a/tools/shared/qtgradienteditor/qtcolorline.h
+++ b/tools/shared/qtgradienteditor/qtcolorline.h
@@ -115,7 +115,7 @@ protected:
 private:
 
     QScopedPointer<class QtColorLinePrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtColorLine)
+    Q_DECLARE_SCOPED_PRIVATE(QtColorLine)
     Q_DISABLE_COPY(QtColorLine)
 };
 
diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h
index f293a2826..6f4079484 100644
--- a/tools/shared/qtgradienteditor/qtgradientdialog.h
+++ b/tools/shared/qtgradienteditor/qtgradientdialog.h
@@ -77,7 +77,7 @@ public:
 
 private:
     QScopedPointer<class QtGradientDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientDialog)
     Q_DISABLE_COPY(QtGradientDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint))
 };
diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h
index 2d9651559..b7dcfd398 100644
--- a/tools/shared/qtgradienteditor/qtgradienteditor.h
+++ b/tools/shared/qtgradienteditor/qtgradienteditor.h
@@ -79,7 +79,7 @@ signals:
 
 private:
     QScopedPointer<class QtGradientEditorPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientEditor)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientEditor)
     Q_DISABLE_COPY(QtGradientEditor)
     Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops))
     Q_PRIVATE_SLOT(d_func(), void slotTypeChanged(int type))
diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
index 7c6a660a1..94a5619e8 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
@@ -71,7 +71,7 @@ signals:
 
 private:
     QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientStopsController)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsController)
     Q_DISABLE_COPY(QtGradientStopsController)
     Q_PRIVATE_SLOT(d_func(), void slotHsvClicked())
     Q_PRIVATE_SLOT(d_func(), void slotRgbClicked())
diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
index a02ebc5a1..8190829dc 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
@@ -112,7 +112,7 @@ signals:
 
 private:
     QScopedPointer<class QtGradientStopsModelPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientStopsModel)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsModel)
     Q_DISABLE_COPY(QtGradientStopsModel)
 };
 
diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
index 753d6952f..7c7c5fcf8 100644
--- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h
@@ -92,7 +92,7 @@ protected:
 
 private:
     QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientStopsWidget)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsWidget)
     Q_DISABLE_COPY(QtGradientStopsWidget)
     Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop))
     Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop))
diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h
index 3e23bf91b..52fdcbb10 100644
--- a/tools/shared/qtgradienteditor/qtgradientwidget.h
+++ b/tools/shared/qtgradienteditor/qtgradientwidget.h
@@ -111,7 +111,7 @@ protected:
 
 private:
     QScopedPointer<class QtGradientWidgetPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGradientWidget)
+    Q_DECLARE_SCOPED_PRIVATE(QtGradientWidget)
     Q_DISABLE_COPY(QtGradientWidget)
 };
 
diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
index a5586571c..13d37e29f 100644
--- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
@@ -72,7 +72,7 @@ protected:
 private:
 
     QScopedPointer<QtButtonPropertyBrowserPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtButtonPropertyBrowser)
+    Q_DECLARE_SCOPED_PRIVATE(QtButtonPropertyBrowser)
     Q_DISABLE_COPY(QtButtonPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotUpdate())
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed())
diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h
index bad208035..ec30f9dc8 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.h
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.h
@@ -61,7 +61,7 @@ protected:
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
     QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtSpinBoxFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtSpinBoxFactory)
     Q_DISABLE_COPY(QtSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
@@ -85,7 +85,7 @@ protected:
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
     QScopedPointer<QtSliderFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtSliderFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtSliderFactory)
     Q_DISABLE_COPY(QtSliderFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
@@ -109,7 +109,7 @@ protected:
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
     QScopedPointer<QtScrollBarFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtScrollBarFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtScrollBarFactory)
     Q_DISABLE_COPY(QtScrollBarFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
@@ -133,7 +133,7 @@ protected:
     void disconnectPropertyManager(QtBoolPropertyManager *manager);
 private:
     QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtCheckBoxFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtCheckBoxFactory)
     Q_DISABLE_COPY(QtCheckBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool))
@@ -155,7 +155,7 @@ protected:
     void disconnectPropertyManager(QtDoublePropertyManager *manager);
 private:
     QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtDoubleSpinBoxFactory)
     Q_DISABLE_COPY(QtDoubleSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double))
@@ -180,7 +180,7 @@ protected:
     void disconnectPropertyManager(QtStringPropertyManager *manager);
 private:
     QScopedPointer<QtLineEditFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtLineEditFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtLineEditFactory)
     Q_DISABLE_COPY(QtLineEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &))
     Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
@@ -203,7 +203,7 @@ protected:
     void disconnectPropertyManager(QtDatePropertyManager *manager);
 private:
     QScopedPointer<QtDateEditFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtDateEditFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtDateEditFactory)
     Q_DISABLE_COPY(QtDateEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *,
@@ -227,7 +227,7 @@ protected:
     void disconnectPropertyManager(QtTimePropertyManager *manager);
 private:
     QScopedPointer<QtTimeEditFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtTimeEditFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtTimeEditFactory)
     Q_DISABLE_COPY(QtTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &))
@@ -249,7 +249,7 @@ protected:
     void disconnectPropertyManager(QtDateTimePropertyManager *manager);
 private:
     QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtDateTimeEditFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtDateTimeEditFactory)
     Q_DISABLE_COPY(QtDateTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &))
@@ -271,7 +271,7 @@ protected:
     void disconnectPropertyManager(QtKeySequencePropertyManager *manager);
 private:
     QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtKeySequenceEditorFactory)
     Q_DISABLE_COPY(QtKeySequenceEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &))
@@ -293,7 +293,7 @@ protected:
     void disconnectPropertyManager(QtCharPropertyManager *manager);
 private:
     QScopedPointer<QtCharEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtCharEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtCharEditorFactory)
     Q_DISABLE_COPY(QtCharEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &))
@@ -315,7 +315,7 @@ protected:
     void disconnectPropertyManager(QtEnumPropertyManager *manager);
 private:
     QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtEnumEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtEnumEditorFactory)
     Q_DISABLE_COPY(QtEnumEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *,
@@ -341,7 +341,7 @@ protected:
     void disconnectPropertyManager(QtCursorPropertyManager *manager);
 private:
     QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtCursorEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtCursorEditorFactory)
     Q_DISABLE_COPY(QtCursorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
@@ -363,7 +363,7 @@ protected:
     void disconnectPropertyManager(QtColorPropertyManager *manager);
 private:
     QScopedPointer<QtColorEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtColorEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtColorEditorFactory)
     Q_DISABLE_COPY(QtColorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -385,7 +385,7 @@ protected:
     void disconnectPropertyManager(QtFontPropertyManager *manager);
 private:
     QScopedPointer<QtFontEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtFontEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtFontEditorFactory)
     Q_DISABLE_COPY(QtFontEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
index 1cfda6308..5124fd587 100644
--- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
@@ -64,7 +64,7 @@ protected:
 private:
 
     QScopedPointer<QtGroupBoxPropertyBrowserPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser)
+    Q_DECLARE_SCOPED_PRIVATE(QtGroupBoxPropertyBrowser)
     Q_DISABLE_COPY(QtGroupBoxPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotUpdate())
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed())
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
index 19996c0c6..dfcb65a4c 100644
--- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -119,7 +119,7 @@ protected:
 private:
     friend class QtProperty;
     QScopedPointer<QtAbstractPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtAbstractPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyManager)
     Q_DISABLE_COPY(QtAbstractPropertyManager)
 };
 
@@ -293,7 +293,7 @@ private:
                 QtAbstractEditorFactoryBase *abstractFactory);
 
     QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser)
+    Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyBrowser)
     Q_DISABLE_COPY(QtAbstractPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *,
                             QtProperty *, QtProperty *))
diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h
index 31c308e73..14b71fb47 100644
--- a/tools/shared/qtpropertybrowser/qtpropertymanager.h
+++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h
@@ -95,7 +95,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtIntPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtIntPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtIntPropertyManager)
     Q_DISABLE_COPY(QtIntPropertyManager)
 };
 
@@ -121,7 +121,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtBoolPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtBoolPropertyManager)
     Q_DISABLE_COPY(QtBoolPropertyManager)
 };
 
@@ -158,7 +158,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtDoublePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtDoublePropertyManager)
     Q_DISABLE_COPY(QtDoublePropertyManager)
 };
 
@@ -186,7 +186,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtStringPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtStringPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtStringPropertyManager)
     Q_DISABLE_COPY(QtStringPropertyManager)
 };
 
@@ -217,7 +217,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtDatePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtDatePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtDatePropertyManager)
     Q_DISABLE_COPY(QtDatePropertyManager)
 };
 
@@ -242,7 +242,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtTimePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtTimePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtTimePropertyManager)
     Q_DISABLE_COPY(QtTimePropertyManager)
 };
 
@@ -267,7 +267,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtDateTimePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtDateTimePropertyManager)
     Q_DISABLE_COPY(QtDateTimePropertyManager)
 };
 
@@ -292,7 +292,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtKeySequencePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtKeySequencePropertyManager)
     Q_DISABLE_COPY(QtKeySequencePropertyManager)
 };
 
@@ -317,7 +317,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtCharPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtCharPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtCharPropertyManager)
     Q_DISABLE_COPY(QtCharPropertyManager)
 };
 
@@ -345,7 +345,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtLocalePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtLocalePropertyManager)
     Q_DISABLE_COPY(QtLocalePropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -374,7 +374,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtPointPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtPointPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtPointPropertyManager)
     Q_DISABLE_COPY(QtPointPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -406,7 +406,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtPointFPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtPointFPropertyManager)
     Q_DISABLE_COPY(QtPointFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -441,7 +441,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtSizePropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtSizePropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtSizePropertyManager)
     Q_DISABLE_COPY(QtSizePropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -479,7 +479,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtSizeFPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtSizeFPropertyManager)
     Q_DISABLE_COPY(QtSizeFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -511,7 +511,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtRectPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtRectPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtRectPropertyManager)
     Q_DISABLE_COPY(QtRectPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -546,7 +546,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtRectFPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtRectFPropertyManager)
     Q_DISABLE_COPY(QtRectFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -580,7 +580,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtEnumPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtEnumPropertyManager)
     Q_DISABLE_COPY(QtEnumPropertyManager)
 };
 
@@ -610,7 +610,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtFlagPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtFlagPropertyManager)
     Q_DISABLE_COPY(QtFlagPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -640,7 +640,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtSizePolicyPropertyManager)
     Q_DISABLE_COPY(QtSizePolicyPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
@@ -673,7 +673,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtFontPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtFontPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtFontPropertyManager)
     Q_DISABLE_COPY(QtFontPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
@@ -707,7 +707,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtColorPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtColorPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtColorPropertyManager)
     Q_DISABLE_COPY(QtColorPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -737,7 +737,7 @@ protected:
     virtual void uninitializeProperty(QtProperty *property);
 private:
     QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtCursorPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtCursorPropertyManager)
     Q_DISABLE_COPY(QtCursorPropertyManager)
 };
 
diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
index ebcf185b4..4994bfc4d 100644
--- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
+++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
@@ -119,7 +119,7 @@ protected:
 private:
 
     QScopedPointer<QtTreePropertyBrowserPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtTreePropertyBrowser)
+    Q_DECLARE_SCOPED_PRIVATE(QtTreePropertyBrowser)
     Q_DISABLE_COPY(QtTreePropertyBrowser)
 
     Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &))
diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h
index 4f32c5772..f4f45da04 100644
--- a/tools/shared/qtpropertybrowser/qtvariantproperty.h
+++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h
@@ -149,7 +149,7 @@ private:
 
     Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *))
-    Q_DECLARE_PRIVATE(QtVariantPropertyManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtVariantPropertyManager)
     Q_DISABLE_COPY(QtVariantPropertyManager)
 };
 
@@ -166,7 +166,7 @@ protected:
     void disconnectPropertyManager(QtVariantPropertyManager *manager);
 private:
     QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtVariantEditorFactory)
+    Q_DECLARE_SCOPED_PRIVATE(QtVariantEditorFactory)
     Q_DISABLE_COPY(QtVariantEditorFactory)
 };
 
diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.cpp b/tools/shared/qttoolbardialog/qttoolbardialog.cpp
index 8ceb5821d..0c4622fbb 100644
--- a/tools/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/tools/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -120,7 +120,7 @@ signals:
 
 private:
     QScopedPointer<QtFullToolBarManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtFullToolBarManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtFullToolBarManager)
     Q_DISABLE_COPY(QtFullToolBarManager)
 };
 
diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.h b/tools/shared/qttoolbardialog/qttoolbardialog.h
index 9227b5668..d3f7396ea 100644
--- a/tools/shared/qttoolbardialog/qttoolbardialog.h
+++ b/tools/shared/qttoolbardialog/qttoolbardialog.h
@@ -89,7 +89,7 @@ private:
 
     friend class QtToolBarDialog;
     QScopedPointer<QtToolBarManagerPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtToolBarManager)
+    Q_DECLARE_SCOPED_PRIVATE(QtToolBarManager)
     Q_DISABLE_COPY(QtToolBarManager)
 };
 
@@ -113,7 +113,7 @@ protected:
 private:
 
     QScopedPointer<QtToolBarDialogPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(QtToolBarDialog)
+    Q_DECLARE_SCOPED_PRIVATE(QtToolBarDialog)
     Q_DISABLE_COPY(QtToolBarDialog)
 
     Q_PRIVATE_SLOT(d_func(), void newClicked())