Privately export all QML-exposed types

We need to be able to access them from C++.

Pick-to: 6.2
Change-Id: I2b7b823cbb36866240d194e877a3dd49f5d2f350
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

31 files changed, 57 insertions, 45 deletions

diff --git a/src/qml/types/qqmlbind_p.h b/src/qml/types/qqmlbind_p.h
index 052af0d167..25c185fee3 100644
--- a/src/qml/types/qqmlbind_p.h
+++ b/src/qml/types/qqmlbind_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtqmlglobal_p.h>
 #include <qqml.h>
 
 #include <QtCore/qobject.h>
@@ -58,7 +59,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlBindPrivate;
-class Q_AUTOTEST_EXPORT QQmlBind : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus
+class Q_QML_PRIVATE_EXPORT QQmlBind : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus
 {
 public:
     enum RestorationMode {
diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h
index 0cf6d045af..907c8607c7 100644
--- a/src/qml/types/qqmlconnections_p.h
+++ b/src/qml/types/qqmlconnections_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 class QQmlBoundSignal;
 class QQmlContext;
 class QQmlConnectionsPrivate;
-class Q_AUTOTEST_EXPORT QQmlConnections : public QObject, public QQmlParserStatus
+class Q_QML_PRIVATE_EXPORT QQmlConnections : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQmlConnections)
diff --git a/src/qmlmodels/qquickpackage_p.h b/src/qmlmodels/qquickpackage_p.h
index f40ffe552a..6df7b3df84 100644
--- a/src/qmlmodels/qquickpackage_p.h
+++ b/src/qmlmodels/qquickpackage_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickPackagePrivate;
 class QQuickPackageAttached;
-class Q_AUTOTEST_EXPORT QQuickPackage : public QObject
+class Q_QMLMODELS_PRIVATE_EXPORT QQuickPackage : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickPackage)
diff --git a/src/qmlworkerscript/qquickworkerscript_p.h b/src/qmlworkerscript/qquickworkerscript_p.h
index d1ea34422a..45e84b4440 100644
--- a/src/qmlworkerscript/qquickworkerscript_p.h
+++ b/src/qmlworkerscript/qquickworkerscript_p.h
@@ -84,7 +84,7 @@ private:
 };
 
 class QQmlV4Function;
-class Q_AUTOTEST_EXPORT QQuickWorkerScript : public QObject, public QQmlParserStatus
+class Q_QMLWORKERSCRIPT_PRIVATE_EXPORT QQuickWorkerScript : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h
index 6f7a7e45d5..9860062079 100644
--- a/src/quick/items/qquickanimatedimage_p.h
+++ b/src/quick/items/qquickanimatedimage_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 class QMovie;
 class QQuickAnimatedImagePrivate;
 
-class Q_AUTOTEST_EXPORT QQuickAnimatedImage : public QQuickImage
+class Q_QUICK_PRIVATE_EXPORT QQuickAnimatedImage : public QQuickImage
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index de9868dc7b..1f4df371bc 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -67,7 +67,7 @@ class QQuickSpriteEngine;
 class QSGGeometryNode;
 class QQuickAnimatedSpritePrivate;
 class QSGSpriteNode;
-class Q_AUTOTEST_EXPORT QQuickAnimatedSprite : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickAnimatedSprite : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h
index 48922147ba..da489b9be7 100644
--- a/src/quick/items/qquickborderimage_p.h
+++ b/src/quick/items/qquickborderimage_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QQuickScaleGrid;
 class QQuickGridScaledImage;
 class QQuickBorderImagePrivate;
-class Q_AUTOTEST_EXPORT QQuickBorderImage : public QQuickImageBase
+class Q_QUICK_PRIVATE_EXPORT QQuickBorderImage : public QQuickImageBase
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h
index cabb54011d..74f16df9cc 100644
--- a/src/quick/items/qquickdroparea_p.h
+++ b/src/quick/items/qquickdroparea_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include "qquickitem.h"
 
 #include <QtGui/qevent.h>
@@ -149,7 +150,7 @@ private:
 };
 
 class QQuickDropAreaPrivate;
-class Q_AUTOTEST_EXPORT QQuickDropArea : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickDropArea : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged)
diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index 8d6716ec53..7a274395b4 100644
--- a/src/quick/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -64,7 +64,7 @@ QT_REQUIRE_CONFIG(quick_flipable);
 QT_BEGIN_NAMESPACE
 
 class QQuickFlipablePrivate;
-class Q_AUTOTEST_EXPORT QQuickFlipable : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickFlipable : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h
index d3e9197fc7..b8c69a2419 100644
--- a/src/quick/items/qquickfocusscope_p.h
+++ b/src/quick/items/qquickfocusscope_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include "qquickitem.h"
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickFocusScope : public QQuickItem
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(FocusScope)
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index 8aa7f0be12..9ea621b90e 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickGridViewAttached;
 class QQuickGridViewPrivate;
-class Q_AUTOTEST_EXPORT QQuickGridView : public QQuickItemView
+class Q_QUICK_PRIVATE_EXPORT QQuickGridView : public QQuickItemView
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickGridView)
diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h
index ee4df1b6ca..6cc81ab116 100644
--- a/src/quick/items/qquickitemanimation_p.h
+++ b/src/quick/items/qquickitemanimation_p.h
@@ -58,7 +58,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickParentAnimationPrivate;
-class Q_AUTOTEST_EXPORT QQuickParentAnimation : public QQuickAnimationGroup
+class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QQuickAnimationGroup
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickParentAnimation)
@@ -95,7 +95,7 @@ protected:
 };
 
 class QQuickAnchorAnimationPrivate;
-class Q_AUTOTEST_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickAnchorAnimation)
@@ -133,7 +133,7 @@ protected:
 class QQuickItem;
 class QQuickPath;
 class QQuickPathAnimationPrivate;
-class Q_AUTOTEST_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickPathAnimation)
diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h
index dbe920c4f8..1d60f2845f 100644
--- a/src/quick/items/qquickloader_p.h
+++ b/src/quick/items/qquickloader_p.h
@@ -56,7 +56,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickLoaderPrivate;
-class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem
+class Q_QUICK_PRIVATE_EXPORT QQuickLoader : public QQuickImplicitSizeItem
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 7b6426d3ab..66626e8610 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include "qquickitem.h"
 #include "qevent.h"
 
@@ -63,7 +64,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickMultiPointTouchArea;
-class Q_AUTOTEST_EXPORT QQuickTouchPoint : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickTouchPoint : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int pointId READ pointId NOTIFY pointIdChanged)
@@ -209,7 +210,7 @@ private:
     QList<QObject*> _touchPoints;
 };
 
-class Q_AUTOTEST_EXPORT QQuickMultiPointTouchArea : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickMultiPointTouchArea : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 124f0fe5d3..c100b800e0 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -51,11 +51,13 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
 #include "qquickitem.h"
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QQuickPinch : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickPinch : public QObject
 {
     Q_OBJECT
 
@@ -194,7 +196,7 @@ private:
     bool m_active;
 };
 
-class Q_AUTOTEST_EXPORT QQuickPinchEvent : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickPinchEvent : public QObject
 {
     Q_OBJECT
 
@@ -266,7 +268,7 @@ private:
 
 class QQuickMouseEvent;
 class QQuickPinchAreaPrivate;
-class Q_AUTOTEST_EXPORT QQuickPinchArea : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickPinchArea : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index 2c3aa674c6..1f2282a1ce 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -233,7 +233,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickBasePositioner)
 };
 
-class Q_AUTOTEST_EXPORT QQuickColumn : public QQuickBasePositioner
+class Q_QUICK_PRIVATE_EXPORT QQuickColumn : public QQuickBasePositioner
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Column)
@@ -249,7 +249,7 @@ private:
 };
 
 class QQuickRowPrivate;
-class Q_AUTOTEST_EXPORT QQuickRow: public QQuickBasePositioner
+class Q_QUICK_PRIVATE_EXPORT QQuickRow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
@@ -277,7 +277,7 @@ private:
 };
 
 class QQuickGridPrivate;
-class Q_AUTOTEST_EXPORT QQuickGrid : public QQuickBasePositioner
+class Q_QUICK_PRIVATE_EXPORT QQuickGrid : public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
@@ -366,7 +366,7 @@ private:
 };
 
 class QQuickFlowPrivate;
-class Q_AUTOTEST_EXPORT QQuickFlow: public QQuickBasePositioner
+class Q_QUICK_PRIVATE_EXPORT QQuickFlow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 1e3746161b..6148b84067 100644
--- a/src/quick/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -61,7 +61,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QQuickScaleGrid : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickScaleGrid : public QObject
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h
index 39b536daae..a1b137fef7 100644
--- a/src/quick/items/qquickspritesequence_p.h
+++ b/src/quick/items/qquickspritesequence_p.h
@@ -64,7 +64,7 @@ class QQuickSprite;
 class QQuickSpriteEngine;
 class QQuickSpriteSequencePrivate;
 class QSGSpriteNode;
-class Q_AUTOTEST_EXPORT QQuickSpriteSequence : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickSpriteSequence : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index 44411c055d..2f5077046e 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -61,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickParentChangePrivate;
-class Q_AUTOTEST_EXPORT QQuickParentChange : public QQuickStateOperation, public QQuickStateActionEvent
+class Q_QUICK_PRIVATE_EXPORT QQuickParentChange : public QQuickStateOperation, public QQuickStateActionEvent
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickParentChange)
@@ -128,7 +128,7 @@ public:
 
 class QQuickAnchorChanges;
 class QQuickAnchorSetPrivate;
-class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickAnchorSet : public QObject
 {
     Q_OBJECT
 
@@ -183,7 +183,7 @@ private:
 };
 
 class QQuickAnchorChangesPrivate;
-class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QQuickStateOperation, public QQuickStateActionEvent
+class Q_QUICK_PRIVATE_EXPORT QQuickAnchorChanges : public QQuickStateOperation, public QQuickStateActionEvent
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickAnchorChanges)
diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h
index 9832989e73..1853f2f9c6 100644
--- a/src/quick/items/qquicktranslate_p.h
+++ b/src/quick/items/qquicktranslate_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include "qquickitem.h"
 
 #include <QtGui/qmatrix4x4.h>
@@ -58,7 +59,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickTranslatePrivate;
-class Q_AUTOTEST_EXPORT QQuickTranslate : public QQuickTransform
+class Q_QUICK_PRIVATE_EXPORT QQuickTranslate : public QQuickTransform
 {
     Q_OBJECT
 
@@ -89,7 +90,7 @@ private:
 };
 
 class QQuickScalePrivate;
-class Q_AUTOTEST_EXPORT QQuickScale : public QQuickTransform
+class Q_QUICK_PRIVATE_EXPORT QQuickScale : public QQuickTransform
 {
     Q_OBJECT
 
@@ -129,7 +130,7 @@ private:
 };
 
 class QQuickRotationPrivate;
-class Q_AUTOTEST_EXPORT QQuickRotation : public QQuickTransform
+class Q_QUICK_PRIVATE_EXPORT QQuickRotation : public QQuickTransform
 {
     Q_OBJECT
 
@@ -164,7 +165,7 @@ private:
 };
 
 class QQuickMatrix4x4Private;
-class Q_AUTOTEST_EXPORT QQuickMatrix4x4 : public QQuickTransform
+class Q_QUICK_PRIVATE_EXPORT QQuickMatrix4x4 : public QQuickTransform
 {
     Q_OBJECT
 
diff --git a/src/quick/util/qquickanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h
index de308735ef..46daf0b98f 100644
--- a/src/quick/util/qquickanimationcontroller_p.h
+++ b/src/quick/util/qquickanimationcontroller_p.h
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickAnimationControllerPrivate;
-class Q_AUTOTEST_EXPORT QQuickAnimationController : public QObject, public QQmlParserStatus
+class Q_QUICK_PRIVATE_EXPORT QQuickAnimationController : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index 634b9b4aad..dd67b4b11d 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -63,7 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QQuickApplication : public QQmlApplication
+class Q_QUICK_PRIVATE_EXPORT QQuickApplication : public QQmlApplication
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active NOTIFY activeChanged) // deprecated, use 'state' instead
diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h
index bc7046e808..3f88ef21ad 100644
--- a/src/quick/util/qquickfontloader_p.h
+++ b/src/quick/util/qquickfontloader_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include <qqml.h>
 
 #include <QtCore/qobject.h>
@@ -59,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickFontLoaderPrivate;
-class Q_AUTOTEST_EXPORT QQuickFontLoader : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickFontLoader : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickFontLoader)
diff --git a/src/quick/util/qquickfontmetrics_p.h b/src/quick/util/qquickfontmetrics_p.h
index 59f4aa8355..9784af3245 100644
--- a/src/quick/util/qquickfontmetrics_p.h
+++ b/src/quick/util/qquickfontmetrics_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include <qqml.h>
 
 #include <QtGui/QFontMetricsF>
@@ -60,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QFont;
 
-class Q_AUTOTEST_EXPORT QQuickFontMetrics : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickFontMetrics : public QObject
 {
     Q_OBJECT
 
diff --git a/src/quick/util/qquickpathinterpolator_p.h b/src/quick/util/qquickpathinterpolator_p.h
index 70fb0935e8..76e395539d 100644
--- a/src/quick/util/qquickpathinterpolator_p.h
+++ b/src/quick/util/qquickpathinterpolator_p.h
@@ -61,7 +61,7 @@ QT_REQUIRE_CONFIG(quick_path);
 QT_BEGIN_NAMESPACE
 
 class QQuickPath;
-class Q_AUTOTEST_EXPORT QQuickPathInterpolator : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickPathInterpolator : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickPath *path READ path WRITE setPath NOTIFY pathChanged)
diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h
index 4a53a4406f..9293b9aeff 100644
--- a/src/quick/util/qquicksmoothedanimation_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlProperty;
 class QQuickSmoothedAnimationPrivate;
-class Q_AUTOTEST_EXPORT QQuickSmoothedAnimation : public QQuickNumberAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickSmoothedAnimation : public QQuickNumberAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickSmoothedAnimation)
diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h
index c09806e0ec..22ac06f619 100644
--- a/src/quick/util/qquickspringanimation_p.h
+++ b/src/quick/util/qquickspringanimation_p.h
@@ -59,7 +59,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickSpringAnimationPrivate;
-class Q_AUTOTEST_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickSpringAnimation)
diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h
index 62f4910606..292b989d86 100644
--- a/src/quick/util/qquickstatechangescript_p.h
+++ b/src/quick/util/qquickstatechangescript_p.h
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickStateChangeScriptPrivate;
-class Q_AUTOTEST_EXPORT QQuickStateChangeScript : public QQuickStateOperation, public QQuickStateActionEvent
+class Q_QUICK_PRIVATE_EXPORT QQuickStateChangeScript : public QQuickStateOperation, public QQuickStateActionEvent
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickStateChangeScript)
diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h
index 1682570363..f5040bcc74 100644
--- a/src/quick/util/qquicksystempalette_p.h
+++ b/src/quick/util/qquicksystempalette_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include <qqml.h>
 
 #include <QtCore/qobject.h>
@@ -59,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickSystemPalettePrivate;
-class Q_AUTOTEST_EXPORT QQuickSystemPalette : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickSystemPalette : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickSystemPalette)
diff --git a/src/quick/util/qquicktextmetrics_p.h b/src/quick/util/qquicktextmetrics_p.h
index 33c64073c2..4306da7258 100644
--- a/src/quick/util/qquicktextmetrics_p.h
+++ b/src/quick/util/qquicktextmetrics_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include <qqml.h>
 
 #include <QtGui/QFontMetricsF>
@@ -60,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QFont;
 
-class Q_AUTOTEST_EXPORT QQuickTextMetrics : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickTextMetrics : public QObject
 {
     Q_OBJECT
 
diff --git a/src/quick/util/qquickvalidator_p.h b/src/quick/util/qquickvalidator_p.h
index d0e3c9d784..8347a4a32b 100644
--- a/src/quick/util/qquickvalidator_p.h
+++ b/src/quick/util/qquickvalidator_p.h
@@ -51,13 +51,14 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
 #include <QtGui/qvalidator.h>
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
 #if QT_CONFIG(validator)
-class Q_AUTOTEST_EXPORT QQuickIntValidator : public QIntValidator
+class Q_QUICK_PRIVATE_EXPORT QQuickIntValidator : public QIntValidator
 {
     Q_OBJECT
     Q_PROPERTY(QString locale READ localeName WRITE setLocaleName RESET resetLocaleName NOTIFY localeNameChanged)
@@ -74,7 +75,7 @@ Q_SIGNALS:
     void localeNameChanged();
 };
 
-class Q_AUTOTEST_EXPORT QQuickDoubleValidator : public QDoubleValidator
+class Q_QUICK_PRIVATE_EXPORT QQuickDoubleValidator : public QDoubleValidator
 {
     Q_OBJECT
     Q_PROPERTY(QString locale READ localeName WRITE setLocaleName RESET resetLocaleName NOTIFY localeNameChanged)