Remove unnecessary exports

Reduce library load time by removing any exports which are not required
by existing clients.

Task-number: QTBUG-24768
Change-Id: Ia5754d6f97bb2ed46e290820a5b092f85a4bc5b0
Reviewed-by: Martin Jones <martin.jones@nokia.com>

35 files changed, 51 insertions, 61 deletions

diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h
index d26aa868ce..47869826ec 100644
--- a/src/qml/animations/qabstractanimationjob_p.h
+++ b/src/qml/animations/qabstractanimationjob_p.h
@@ -42,7 +42,7 @@
 #ifndef QABSTRACTANIMATIONJOB_P_H
 #define QABSTRACTANIMATIONJOB_P_H
 
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 #include <QtCore/QObject>
 #include <QtCore/private/qabstractanimation_p.h>
 #include "private/qpodvector_p.h"
@@ -55,7 +55,7 @@ QT_MODULE(Qml)
 
 class QAnimationGroupJob;
 class QAnimationJobChangeListener;
-class Q_QML_EXPORT QAbstractAnimationJob
+class Q_QML_PRIVATE_EXPORT QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QAbstractAnimationJob)
 public:
@@ -171,7 +171,7 @@ public:
     virtual void animationCurrentLoopChanged(QAbstractAnimationJob *) {}
 };
 
-class Q_QML_EXPORT QQmlAnimationTimer : public QAbstractAnimationTimer
+class Q_QML_PRIVATE_EXPORT QQmlAnimationTimer : public QAbstractAnimationTimer
 {
     Q_OBJECT
 private:
diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h
index 303dc898d9..408ac08af7 100644
--- a/src/qml/animations/qanimationgroupjob_p.h
+++ b/src/qml/animations/qanimationgroupjob_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Qml)
 
-class Q_QML_EXPORT QAnimationGroupJob : public QAbstractAnimationJob
+class Q_QML_PRIVATE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QAnimationGroupJob)
 public:
diff --git a/src/qml/animations/qparallelanimationgroupjob_p.h b/src/qml/animations/qparallelanimationgroupjob_p.h
index d77a8c84f9..584bd88e9b 100644
--- a/src/qml/animations/qparallelanimationgroupjob_p.h
+++ b/src/qml/animations/qparallelanimationgroupjob_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Qml)
 
-class Q_QML_EXPORT QParallelAnimationGroupJob : public QAnimationGroupJob
+class Q_QML_PRIVATE_EXPORT QParallelAnimationGroupJob : public QAnimationGroupJob
 {
     Q_DISABLE_COPY(QParallelAnimationGroupJob)
 public:
diff --git a/src/qml/animations/qpauseanimationjob_p.h b/src/qml/animations/qpauseanimationjob_p.h
index 82462be101..9e64c92c3d 100644
--- a/src/qml/animations/qpauseanimationjob_p.h
+++ b/src/qml/animations/qpauseanimationjob_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Qml)
 
-class Q_QML_EXPORT QPauseAnimationJob : public QAbstractAnimationJob
+class Q_QML_PRIVATE_EXPORT QPauseAnimationJob : public QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QPauseAnimationJob)
 public:
diff --git a/src/qml/animations/qsequentialanimationgroupjob_p.h b/src/qml/animations/qsequentialanimationgroupjob_p.h
index b406d04f6f..889e013118 100644
--- a/src/qml/animations/qsequentialanimationgroupjob_p.h
+++ b/src/qml/animations/qsequentialanimationgroupjob_p.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Qml)
 
 class QPauseAnimationJob;
-class Q_QML_EXPORT QSequentialAnimationGroupJob : public QAnimationGroupJob
+class Q_QML_PRIVATE_EXPORT QSequentialAnimationGroupJob : public QAnimationGroupJob
 {
     Q_DISABLE_COPY(QSequentialAnimationGroupJob)
 public:
diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h
index be02602f38..13baa18848 100644
--- a/src/qml/debugger/qqmldebugserver_p.h
+++ b/src/qml/debugger/qqmldebugserver_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 
 class QQmlDebugServerPrivate;
-class Q_QML_EXPORT QQmlDebugServer : public QObject
+class Q_QML_PRIVATE_EXPORT QQmlDebugServer : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQmlDebugServer)
diff --git a/src/qml/debugger/qqmldebugserverconnection_p.h b/src/qml/debugger/qqmldebugserverconnection_p.h
index 920e82ed47..66e7abf999 100644
--- a/src/qml/debugger/qqmldebugserverconnection_p.h
+++ b/src/qml/debugger/qqmldebugserverconnection_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 
 class QQmlDebugServer;
-class Q_QML_EXPORT QQmlDebugServerConnection
+class Q_QML_PRIVATE_EXPORT QQmlDebugServerConnection
 {
 public:
     QQmlDebugServerConnection() {}
diff --git a/src/qml/debugger/qqmlinspectorinterface_p.h b/src/qml/debugger/qqmlinspectorinterface_p.h
index 5b015d36df..3cba863eae 100644
--- a/src/qml/debugger/qqmlinspectorinterface_p.h
+++ b/src/qml/debugger/qqmlinspectorinterface_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
-class Q_QML_EXPORT QQmlInspectorInterface
+class Q_QML_PRIVATE_EXPORT QQmlInspectorInterface
 {
 public:
     QQmlInspectorInterface() {}
diff --git a/src/qml/debugger/qqmlinspectorservice_p.h b/src/qml/debugger/qqmlinspectorservice_p.h
index 557dc38aa8..3f989589d0 100644
--- a/src/qml/debugger/qqmlinspectorservice_p.h
+++ b/src/qml/debugger/qqmlinspectorservice_p.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlInspectorInterface;
 
-class Q_QML_EXPORT QQmlInspectorService : public QQmlDebugService
+class Q_QML_PRIVATE_EXPORT QQmlInspectorService : public QQmlDebugService
 {
     Q_OBJECT
 
diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h
index 5d1002157b..02481e5147 100644
--- a/src/qml/debugger/qqmlprofilerservice_p.h
+++ b/src/qml/debugger/qqmlprofilerservice_p.h
@@ -91,7 +91,7 @@ class QUrl;
 class QQmlEngine;
 
 
-class Q_QML_EXPORT QQmlProfilerService : public QQmlDebugService
+class Q_QML_PRIVATE_EXPORT QQmlProfilerService : public QQmlDebugService
 {
 public:
     enum Message {
diff --git a/src/qml/qml/ftw/qqmlpool_p.h b/src/qml/qml/ftw/qqmlpool_p.h
index 8e8f367890..d4b766825a 100644
--- a/src/qml/qml/ftw/qqmlpool_p.h
+++ b/src/qml/qml/ftw/qqmlpool_p.h
@@ -53,14 +53,13 @@
 // We mean it.
 //
 
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
-// Exported for QtQuick1
-class Q_QML_EXPORT QQmlPool
+class Q_QML_PRIVATE_EXPORT QQmlPool
 {
 public:
     // The class has a destructor that needs to be called
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index 1dbca44a08..b7f5cb714d 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -410,7 +410,6 @@ QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
     return qmlAttachedPropertiesObject(&idx, obj, &T::staticMetaObject, create);
 }
 
-// For the use of QtQuick1 module
 Q_QML_EXPORT void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor);
 
 inline int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor,
diff --git a/src/qml/qml/qqmlaccessors_p.h b/src/qml/qml/qqmlaccessors_p.h
index 5685869f73..4337997870 100644
--- a/src/qml/qml/qqmlaccessors_p.h
+++ b/src/qml/qml/qqmlaccessors_p.h
@@ -42,7 +42,7 @@
 #ifndef QQMLACCESSORS_P_H
 #define QQMLACCESSORS_P_H
 
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qhash.h>
 #include <QtCore/QReadWriteLock>
@@ -133,7 +133,7 @@ namespace QQmlAccessorProperties {
     };
 
     Properties properties(const QMetaObject *);
-    void Q_QML_EXPORT registerProperties(const QMetaObject *, int, Property *);
+    void Q_QML_PRIVATE_EXPORT registerProperties(const QMetaObject *, int, Property *);
 };
 
 QQmlAccessorProperties::Property *
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index c0544251b1..a81060021c 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -103,7 +103,7 @@ private:
     bool m_expressionFunctionRewritten:1;
 };
 
-class Q_QML_EXPORT QQmlAbstractBoundSignal
+class Q_QML_PRIVATE_EXPORT QQmlAbstractBoundSignal
 {
 public:
     QQmlAbstractBoundSignal();
@@ -128,8 +128,8 @@ private:
 };
 
 class QQmlBoundSignalParameters;
-class Q_QML_EXPORT QQmlBoundSignal : public QQmlAbstractBoundSignal,
-                                     public QQmlNotifierEndpoint
+class Q_QML_PRIVATE_EXPORT QQmlBoundSignal : public QQmlAbstractBoundSignal,
+                                             public QQmlNotifierEndpoint
 {
 public:
     QQmlBoundSignal(QObject *scope, const QMetaMethod &signal, QObject *owner, QQmlEngine *engine);
diff --git a/src/qml/qml/qqmlboundsignalexpressionpointer_p.h b/src/qml/qml/qqmlboundsignalexpressionpointer_p.h
index cc2106f496..94675e34ce 100644
--- a/src/qml/qml/qqmlboundsignalexpressionpointer_p.h
+++ b/src/qml/qml/qqmlboundsignalexpressionpointer_p.h
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlBoundSignalExpression;
-class Q_QML_EXPORT QQmlBoundSignalExpressionPointer
+class Q_QML_PRIVATE_EXPORT QQmlBoundSignalExpressionPointer
 {
 public:
     inline QQmlBoundSignalExpressionPointer() : o(0) {}
diff --git a/src/qml/qml/qqmlbundle_p.h b/src/qml/qml/qqmlbundle_p.h
index f09447c011..8c2cc55d95 100644
--- a/src/qml/qml/qqmlbundle_p.h
+++ b/src/qml/qml/qqmlbundle_p.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qstring.h>
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 
 #ifdef Q_CC_MSVC
 // nonstandard extension used : zero-sized array in struct/union.
@@ -53,11 +53,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QML_EXPORT QQmlBundle
+class Q_QML_PRIVATE_EXPORT QQmlBundle
 {
     Q_DISABLE_COPY(QQmlBundle)
 public:
-    struct Q_PACKED Q_QML_EXPORT Entry
+    struct Q_PACKED Q_QML_PRIVATE_EXPORT Entry
     {
         enum Kind {
             File = 123, // Normal file
@@ -71,12 +71,12 @@ public:
         quint64 size;
     };
 
-    struct Q_PACKED Q_QML_EXPORT RawEntry : public Entry
+    struct Q_PACKED Q_QML_PRIVATE_EXPORT RawEntry : public Entry
     {
         char data[]; // trailing data
     };
 
-    struct Q_PACKED Q_QML_EXPORT FileEntry : public Entry
+    struct Q_PACKED Q_QML_PRIVATE_EXPORT FileEntry : public Entry
     {
         quint64 link;
         int fileNameLength;
diff --git a/src/qml/qml/qqmlcleanup_p.h b/src/qml/qml/qqmlcleanup_p.h
index 2b7747d630..8fd53c59d0 100644
--- a/src/qml/qml/qqmlcleanup_p.h
+++ b/src/qml/qml/qqmlcleanup_p.h
@@ -42,7 +42,7 @@
 #ifndef QQMLCLEANUP_P_H
 #define QQMLCLEANUP_P_H
 
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 
 // 
 //  W A R N I N G
@@ -59,8 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlEngine;
 
-// Exported for QtQuick1
-class Q_QML_EXPORT QQmlCleanup
+class Q_QML_PRIVATE_EXPORT QQmlCleanup
 {
 public:
     QQmlCleanup();
diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index 4eb31177f6..9daec85c5e 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -113,7 +113,7 @@ public:
 class QQmlVME;
 class QQmlComponentAttached;
 class QQmlGuardedContextData;
-class Q_QML_EXPORT QQmlContextData
+class Q_QML_PRIVATE_EXPORT QQmlContextData
 {
 public:
     QQmlContextData();
diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h
index ecc4bae4c3..0207797ce9 100644
--- a/src/qml/qml/qqmlcustomparser_p.h
+++ b/src/qml/qml/qqmlcustomparser_p.h
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 class QQmlCompiler;
 
 class QQmlCustomParserPropertyPrivate;
-class Q_QML_EXPORT QQmlCustomParserProperty
+class Q_QML_PRIVATE_EXPORT QQmlCustomParserProperty
 {
 public:
     QQmlCustomParserProperty();
@@ -92,7 +92,7 @@ private:
 };
 
 class QQmlCustomParserNodePrivate;
-class Q_QML_EXPORT QQmlCustomParserNode
+class Q_QML_PRIVATE_EXPORT QQmlCustomParserNode
 {
 public:
     QQmlCustomParserNode();
@@ -110,7 +110,7 @@ private:
     QQmlCustomParserNodePrivate *d;
 };
 
-class Q_QML_EXPORT QQmlCustomParser
+class Q_QML_PRIVATE_EXPORT QQmlCustomParser
 {
 public:
     enum Flag {
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h
index f7180b9332..6547e19f3e 100644
--- a/src/qml/qml/qqmldata_p.h
+++ b/src/qml/qml/qqmldata_p.h
@@ -74,7 +74,7 @@ class QQmlNotifierEndpoint;
 // default state for elemental object allocations.  This is crucial in the
 // workings of the QQmlInstruction::CreateSimpleObject instruction.
 // Don't change anything here without first considering that case!
-class Q_QML_EXPORT QQmlData : public QAbstractDeclarativeData
+class Q_QML_PRIVATE_EXPORT QQmlData : public QAbstractDeclarativeData
 {
 public:
     QQmlData()
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index d3e7bc2e4d..8048e409f9 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -118,7 +118,7 @@ public:
     QQmlJavaScriptExpressionGuard *next;
 };
 
-class Q_QML_EXPORT QQmlEnginePrivate : public QJSEnginePrivate
+class Q_QML_PRIVATE_EXPORT QQmlEnginePrivate : public QJSEnginePrivate
 {
     Q_DECLARE_PUBLIC(QQmlEngine)
 public:
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h
index d32e2d314c..372d72c655 100644
--- a/src/qml/qml/qqmlexpression_p.h
+++ b/src/qml/qml/qqmlexpression_p.h
@@ -69,9 +69,9 @@ QT_BEGIN_NAMESPACE
 
 class QQmlExpression;
 class QString;
-class Q_QML_PRIVATE_EXPORT QQmlExpressionPrivate : public QObjectPrivate,
-                                                   public QQmlJavaScriptExpression,
-                                                   public QQmlAbstractExpression
+class QQmlExpressionPrivate : public QObjectPrivate,
+                              public QQmlJavaScriptExpression,
+                              public QQmlAbstractExpression
 {
     Q_DECLARE_PUBLIC(QQmlExpression)
 public:
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index e5515b60cb..6e233c9fae 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
     QMetaObject::connect(sender, signalIdx, receiver, methodIdx, Qt::DirectConnection); \
 }
 
-bool Q_QML_EXPORT QQml_isSignalConnected(QObject*, int, int);
+bool Q_QML_PRIVATE_EXPORT QQml_isSignalConnected(QObject*, int, int);
 
 #define IS_SIGNAL_CONNECTED(Sender, Signal) \
 do { \
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h
index 111bf29641..c88516dc95 100644
--- a/src/qml/qml/qqmlimport_p.h
+++ b/src/qml/qml/qqmlimport_p.h
@@ -71,8 +71,7 @@ class QQmlImportsPrivate;
 class QQmlImportDatabase;
 class QQmlTypeLoader;
 
-// Exported for QtQuick1
-class Q_QML_EXPORT QQmlImports
+class Q_QML_PRIVATE_EXPORT QQmlImports
 {
 public:
     QQmlImports(QQmlTypeLoader *);
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h
index 26fa6846e7..a81d73b622 100644
--- a/src/qml/qml/qqmlnotifier_p.h
+++ b/src/qml/qml/qqmlnotifier_p.h
@@ -48,7 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlNotifierEndpoint;
-class Q_QML_EXPORT QQmlNotifier
+class Q_QML_PRIVATE_EXPORT QQmlNotifier
 {
 public:
     inline QQmlNotifier();
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index a128cd9055..98322b0275 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -223,7 +223,7 @@ private:
     bool notFullyResolved() const { return flags & NotFullyResolved; }
 };
 
-class Q_QML_EXPORT QQmlPropertyCache : public QQmlRefCount, public QQmlCleanup
+class Q_QML_PRIVATE_EXPORT QQmlPropertyCache : public QQmlRefCount, public QQmlCleanup
 {
 public:
     QQmlPropertyCache(QQmlEngine *);
diff --git a/src/qml/qml/qqmlpropertyvalueinterceptor_p.h b/src/qml/qml/qqmlpropertyvalueinterceptor_p.h
index 6cd94b3fd1..16cd4fc853 100644
--- a/src/qml/qml/qqmlpropertyvalueinterceptor_p.h
+++ b/src/qml/qml/qqmlpropertyvalueinterceptor_p.h
@@ -53,13 +53,13 @@
 // We mean it.
 //
 
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQmlProperty;
-class Q_QML_EXPORT QQmlPropertyValueInterceptor
+class Q_QML_PRIVATE_EXPORT QQmlPropertyValueInterceptor
 {
 public:
     QQmlPropertyValueInterceptor();
diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h
index 65dd406476..daf9fdce14 100644
--- a/src/qml/qml/qqmlscript_p.h
+++ b/src/qml/qml/qqmlscript_p.h
@@ -136,7 +136,7 @@ public:
 class Object;
 class Property;
 
-class Q_QML_EXPORT Variant 
+class Q_QML_PRIVATE_EXPORT Variant
 {
 public:
     enum Type {
@@ -467,7 +467,7 @@ public:
 };
 
 class ParserJsASTData;
-class Q_QML_EXPORT Parser
+class Q_QML_PRIVATE_EXPORT Parser
 {
 public:
     Parser();
diff --git a/src/qml/qml/qqmlstringconverters_p.h b/src/qml/qml/qqmlstringconverters_p.h
index 3e637db83b..2b2131d5e1 100644
--- a/src/qml/qml/qqmlstringconverters_p.h
+++ b/src/qml/qml/qqmlstringconverters_p.h
@@ -66,7 +66,6 @@ class QRectF;
 class QString;
 class QByteArray;
 
-// XXX - Bauhaus currently uses these methods which is why they're exported
 namespace QQmlStringConverters
 {
     Q_QML_PRIVATE_EXPORT QVariant variantFromString(const QString &);
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index ab700805c4..a795d3c816 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -81,7 +81,6 @@ class QQmlTypeData;
 class QQmlDataLoader;
 class QQmlExtensionInterface;
 
-// Exported for QtQuick1
 class Q_QML_PRIVATE_EXPORT QQmlDataBlob : public QQmlRefCount
 {
 public:
@@ -205,8 +204,7 @@ private:
 };
 
 class QQmlDataLoaderThread;
-// Exported for QtQuick1
-class Q_QML_PRIVATE_EXPORT QQmlDataLoader 
+class QQmlDataLoader
 {
 public:
     QQmlDataLoader(QQmlEngine *);
@@ -254,8 +252,7 @@ public:
     QString fileName;
 };
 
-// Exported for QtQuick1
-class Q_QML_PRIVATE_EXPORT QQmlTypeLoader : public QQmlDataLoader
+class QQmlTypeLoader : public QQmlDataLoader
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlTypeLoader)
 public:
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index d55c839c7d..c72d2fc182 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -167,8 +167,6 @@ private:
     mutable QQmlValueType *valueTypes[QVariant::UserType - 1];
 };
 
-// These exports of these value types are obsolete since QtQuick1 no longer
-// needs them - they should become Q_AUTOTEST_EXPORT
 class Q_QML_PRIVATE_EXPORT QQmlPointFValueType : public QQmlValueTypeBase<QPointF>
 {
     Q_PROPERTY(qreal x READ x WRITE setX)
diff --git a/src/qml/qml/qquicklistmodel_p.h b/src/qml/qml/qquicklistmodel_p.h
index 2941de9148..28b374dc3b 100644
--- a/src/qml/qml/qquicklistmodel_p.h
+++ b/src/qml/qml/qquicklistmodel_p.h
@@ -64,7 +64,7 @@ class QQuickListModelWorkerAgent;
 class ListModel;
 class ListLayout;
 
-class Q_QML_PRIVATE_EXPORT QQuickListModel : public QListModelInterface
+class Q_AUTOTEST_EXPORT QQuickListModel : public QListModelInterface
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index ca1d29011e..772fa82c5a 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -225,7 +225,7 @@ public:
     static void addGcCallbackNode(Node *node);
 };
 
-class Q_QML_EXPORT QV8Engine
+class Q_QML_PRIVATE_EXPORT QV8Engine
 {
 public:
     static QV8Engine* get(QJSEngine* q) { Q_ASSERT(q); return q->handle(); }
diff --git a/src/qml/qml/v8/qv8qobjectwrapper_p.h b/src/qml/qml/v8/qv8qobjectwrapper_p.h
index 47023ffd81..de2ec30e44 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper_p.h
+++ b/src/qml/qml/v8/qv8qobjectwrapper_p.h
@@ -85,7 +85,7 @@ public:
     QIntrusiveListNode weakResource;
 };
 
-class Q_QML_EXPORT QV8QObjectWrapper
+class Q_QML_PRIVATE_EXPORT QV8QObjectWrapper
 {
 public:
     QV8QObjectWrapper();
diff --git a/src/qml/qml/v8/qv8stringwrapper_p.h b/src/qml/qml/v8/qv8stringwrapper_p.h
index 1609720298..e70f427df5 100644
--- a/src/qml/qml/v8/qv8stringwrapper_p.h
+++ b/src/qml/qml/v8/qv8stringwrapper_p.h
@@ -53,14 +53,14 @@
 // We mean it.
 //
 
-#include <QtQml/qtqmlglobal.h>
+#include <private/qtqmlglobal_p.h>
 
 #include <QtCore/qstring.h>
 #include <private/qv8_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QML_EXPORT QV8StringWrapper
+class Q_QML_PRIVATE_EXPORT QV8StringWrapper
 {
 public:
     QV8StringWrapper();