From: Matthew Vogt Date: Mon, 14 May 2012 23:02:09 +0000 (+1000) Subject: Remove unnecessary exports X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=83e820ba767c2d37600d3536ebcfde18234d2f46;p=konrad%2Fqtdeclarative.git 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 --- diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index d26aa86..4786982 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 +#include #include #include #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 303dc89..408ac08 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 d77a8c8..584bd88 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 82462be..9e64c92 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 b406d04..889e013 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 be02602..13baa18 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 920e82e..66e7abf 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 5b015d3..3cba863 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 557dc38..3f98958 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 5d10021..02481e5 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 8e8f367..d4b7668 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 +#include #include #include 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 1dbca44..b7f5cb7 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 5685869..4337997 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 +#include #include #include #include @@ -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 c054425..a810600 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 cc2106f..94675e3 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 f09447c..8c2cc55 100644 --- a/src/qml/qml/qqmlbundle_p.h +++ b/src/qml/qml/qqmlbundle_p.h @@ -44,7 +44,7 @@ #include #include -#include +#include #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 2b7747d..8fd53c5 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 +#include // // 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 4eb3117..9daec85 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 ecc4bae..0207797 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 f7180b9..6547e19 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 d3e7bc2..8048e40 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 d32e2d3..372d72c 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 e5515b6..6e233c9 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 111bf29..c88516d 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 26fa684..a81d73b 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 a128cd9..98322b0 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 6cd94b3..16cd4fc 100644 --- a/src/qml/qml/qqmlpropertyvalueinterceptor_p.h +++ b/src/qml/qml/qqmlpropertyvalueinterceptor_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include +#include #include 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 65dd406..daf9fdc 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 3e637db..2b2131d 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 ab70080..a795d3c 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 d55c839..c72d2fc 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 { 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 2941de9..28b374d 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 ca1d290..772fa82 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 47023ff..de2ec30 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 1609720..e70f427 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 +#include #include #include QT_BEGIN_NAMESPACE -class Q_QML_EXPORT QV8StringWrapper +class Q_QML_PRIVATE_EXPORT QV8StringWrapper { public: QV8StringWrapper(); diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index c7fce72..8e7b992 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QQuickCanvasContext; class QQuickCanvasItemPrivate; -class Q_QUICK_EXPORT QQuickCanvasItem : public QQuickItem +class QQuickCanvasItem : public QQuickItem { Q_OBJECT Q_ENUMS(RenderTarget) diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 4112d4e..909c95f 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -72,7 +72,7 @@ class QQuickPixmap; class QSGTexture; -class Q_QUICK_EXPORT QQuickContext2D : public QQuickCanvasContext +class QQuickContext2D : public QQuickCanvasContext { public: enum TextBaseLineType { Alphabetic=0, Top, Middle, Bottom, Hanging}; diff --git a/src/quick/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h index d592121..404501f 100644 --- a/src/quick/items/qquickcanvas_p.h +++ b/src/quick/items/qquickcanvas_p.h @@ -93,7 +93,7 @@ class QTouchEvent; class QQuickCanvasRenderLoop; class QQuickCanvasIncubationController; -class Q_QUICK_EXPORT QQuickCanvasPrivate : public QWindowPrivate +class Q_QUICK_PRIVATE_EXPORT QQuickCanvasPrivate : public QWindowPrivate { public: Q_DECLARE_PUBLIC(QQuickCanvas) diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 004daaf..9b67c2b 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include #include #include @@ -92,7 +92,7 @@ private: }; // used in QtLocation -class Q_QUICK_EXPORT QQuickMouseEvent : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickMouseEvent : public QObject { Q_OBJECT Q_PROPERTY(qreal x READ x) diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 7a19b0c..109bca2 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -43,6 +43,7 @@ #define QQUICKFLICKABLE_P_H #include "qquickitem.h" +#include QT_BEGIN_HEADER @@ -50,7 +51,7 @@ QT_BEGIN_NAMESPACE class QQuickFlickablePrivate; class QQuickFlickableVisibleArea; -class Q_QUICK_EXPORT QQuickFlickable : public QQuickItem +class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem { Q_OBJECT diff --git a/src/quick/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h index be2b479..4943656 100644 --- a/src/quick/items/qquickimplicitsizeitem_p.h +++ b/src/quick/items/qquickimplicitsizeitem_p.h @@ -43,13 +43,14 @@ #define QQUICKIMPLICITSIZEITEM_H #include "qquickpainteditem.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickImplicitSizeItemPrivate; -class Q_QUICK_EXPORT QQuickImplicitSizeItem : public QQuickItem +class Q_QUICK_PRIVATE_EXPORT QQuickImplicitSizeItem : public QQuickItem { Q_OBJECT Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index ed762d0..8699a56 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -229,7 +229,7 @@ private: QQuickShaderEffectSource *m_effectSource; }; -class Q_QUICK_EXPORT QQuickItemPrivate : public QObjectPrivate +class Q_QUICK_PRIVATE_EXPORT QQuickItemPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickItem) diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h index a3a7e77..ad971bb 100644 --- a/src/quick/items/qquickitemanimation_p.h +++ b/src/quick/items/qquickitemanimation_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickParentAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QQuickAnimationGroup +class Q_AUTOTEST_EXPORT QQuickParentAnimation : public QQuickAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(QQuickParentAnimation) @@ -86,7 +86,7 @@ protected: }; class QQuickAnchorAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation +class Q_AUTOTEST_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnchorAnimation) @@ -120,7 +120,7 @@ protected: class QQuickItem; class QQuickPath; class QQuickPathAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation +class Q_AUTOTEST_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPathAnimation) diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index 7eb9e5d..177d283 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -43,7 +43,7 @@ #define QQUICKMOUSEAREA_P_H #include "qquickitem.h" - +#include #include QT_BEGIN_HEADER @@ -121,7 +121,7 @@ private: class QQuickMouseAreaPrivate; class QQuickWheelEvent; // used in QtLocation -class Q_QUICK_EXPORT QQuickMouseArea : public QQuickItem +class Q_QUICK_PRIVATE_EXPORT QQuickMouseArea : public QQuickItem { Q_OBJECT diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h index 52aa9e8..f077e7f 100644 --- a/src/quick/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_p.h @@ -52,7 +52,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_PRIVATE_EXPORT QQuickPen : public QObject +class Q_AUTOTEST_EXPORT QQuickPen : public QObject { Q_OBJECT @@ -136,7 +136,7 @@ private: }; class QQuickRectanglePrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickRectangle : public QQuickItem +class Q_AUTOTEST_EXPORT QQuickRectangle : public QQuickItem { Q_OBJECT diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h index ae5627a..2af18bf 100644 --- a/src/quick/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_p.h @@ -54,7 +54,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_PRIVATE_EXPORT QQuickScaleGrid : public QObject +class QQuickScaleGrid : public QObject { Q_OBJECT Q_ENUMS(TileRule) @@ -92,7 +92,7 @@ private: int _bottom; }; -class Q_QUICK_PRIVATE_EXPORT QQuickGridScaledImage +class Q_AUTOTEST_EXPORT QQuickGridScaledImage { public: QQuickGridScaledImage(); diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 541bb34..2f41324 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -91,7 +91,7 @@ struct Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectCommon }; -class Q_QUICK_EXPORT QQuickShaderEffect : public QQuickItem +class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffect : public QQuickItem { Q_OBJECT Q_PROPERTY(QByteArray fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged) diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index 0d8f5a2..a6974dc 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QSGGeometry; class QRectF; -class Q_QUICK_EXPORT QQuickShaderEffectMesh : public QObject +class QQuickShaderEffectMesh : public QObject { Q_OBJECT public: diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h index 0853394..cf563b3 100644 --- a/src/quick/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_p.h @@ -76,7 +76,7 @@ private Q_SLOTS: void markDirtyTexture(); }; -class Q_QUICK_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture +class QQuickShaderEffectTexture : public QSGDynamicTexture { Q_OBJECT public: @@ -153,7 +153,7 @@ private: uint m_grab : 1; }; -class Q_QUICK_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener +class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener { Q_OBJECT Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index e69159e..b6aefd7 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -246,7 +246,7 @@ private: }; class QTextLine; -class Q_QUICK_EXPORT QQuickTextLine : public QObject +class QQuickTextLine : public QObject { Q_OBJECT Q_PROPERTY(int number READ number) diff --git a/src/quick/items/qquickvisualdatamodel_p.h b/src/quick/items/qquickvisualdatamodel_p.h index 535374b..836c99a 100644 --- a/src/quick/items/qquickvisualdatamodel_p.h +++ b/src/quick/items/qquickvisualdatamodel_p.h @@ -42,13 +42,13 @@ #ifndef QQUICKVISUALDATAMODEL_P_H #define QQUICKVISUALDATAMODEL_P_H +#include #include #include #include #include - #include #include @@ -67,7 +67,7 @@ class QQuickVisualDataModelAttached; class QQuickVisualDataModelPrivate; -class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QQmlParserStatus +class Q_QUICK_PRIVATE_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickVisualDataModel) diff --git a/src/quick/items/qquickvisualitemmodel_p.h b/src/quick/items/qquickvisualitemmodel_p.h index bf56195..27f0594 100644 --- a/src/quick/items/qquickvisualitemmodel_p.h +++ b/src/quick/items/qquickvisualitemmodel_p.h @@ -42,7 +42,7 @@ #ifndef QQUICKVISUALITEMMODEL_P_H #define QQUICKVISUALITEMMODEL_P_H -#include +#include #include #include @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QQuickItem; class QQuickChangeSet; -class Q_QUICK_EXPORT QQuickVisualModel : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickVisualModel : public QObject { Q_OBJECT @@ -92,7 +92,7 @@ private: class QQuickVisualItemModelAttached; class QQuickVisualItemModelPrivate; -class Q_QUICK_EXPORT QQuickVisualItemModel : public QQuickVisualModel +class Q_QUICK_PRIVATE_EXPORT QQuickVisualItemModel : public QQuickVisualModel { Q_OBJECT Q_DECLARE_PRIVATE(QQuickVisualItemModel) diff --git a/src/quick/items/qquickwindowmanager_p.h b/src/quick/items/qquickwindowmanager_p.h index eb877d4..54b71f3 100644 --- a/src/quick/items/qquickwindowmanager_p.h +++ b/src/quick/items/qquickwindowmanager_p.h @@ -43,14 +43,14 @@ #define QQUICKWINDOWMANAGER_P_H #include -#include +#include QT_BEGIN_NAMESPACE class QQuickCanvas; class QSGContext; -class Q_QUICK_EXPORT QQuickWindowManager +class Q_QUICK_PRIVATE_EXPORT QQuickWindowManager { public: virtual ~QQuickWindowManager(); diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h index e7cd1b0..5c12c32 100644 --- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGDefaultRenderer : public QSGRenderer +class Q_QUICK_PRIVATE_EXPORT QSGDefaultRenderer : public QSGRenderer { Q_OBJECT public: diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index c1df823..1f2d4f7 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -42,7 +42,7 @@ #ifndef NODEUPDATER_P_H #define NODEUPDATER_P_H -#include +#include #include QT_BEGIN_HEADER @@ -57,7 +57,7 @@ class QSGGeometryNode; class QMatrix4x4; class QSGRenderNode; -class Q_QUICK_EXPORT QSGNodeUpdater +class Q_QUICK_PRIVATE_EXPORT QSGNodeUpdater { public: QSGNodeUpdater(); diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h index 3dced9c..82bd2ef 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -66,7 +66,7 @@ class TextureReference; class QSGBindable; class QSGNodeUpdater; -class Q_QUICK_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions +class Q_QUICK_PRIVATE_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions { Q_OBJECT public: @@ -186,7 +186,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRenderer::ClearMode) -class Q_QUICK_EXPORT QSGBindable +class Q_QUICK_PRIVATE_EXPORT QSGBindable { public: virtual ~QSGBindable() { } @@ -224,7 +224,7 @@ QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState } -class Q_QUICK_EXPORT QSGNodeDumper : public QSGNodeVisitor { +class Q_QUICK_PRIVATE_EXPORT QSGNodeDumper : public QSGNodeVisitor { public: static void dump(QSGNode *n); diff --git a/src/quick/scenegraph/coreapi/qsgrendernode_p.h b/src/quick/scenegraph/coreapi/qsgrendernode_p.h index 45636cc..3596d6c 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode_p.h +++ b/src/quick/scenegraph/coreapi/qsgrendernode_p.h @@ -54,12 +54,13 @@ // #include "qsgnode.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGRenderNode : public QSGNode +class Q_QUICK_PRIVATE_EXPORT QSGRenderNode : public QSGNode { public: enum StateFlag diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 77cd814..3c62ce0 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -70,7 +70,7 @@ class QSGDistanceFieldGlyphCacheManager; class QSGDistanceFieldGlyphNode; // TODO: Rename from XInterface to AbstractX. -class Q_QUICK_EXPORT QSGRectangleNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGRectangleNode : public QSGGeometryNode { public: virtual void setRect(const QRectF &rect) = 0; @@ -85,7 +85,7 @@ public: }; -class Q_QUICK_EXPORT QSGImageNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGImageNode : public QSGGeometryNode { public: virtual void setTargetRect(const QRectF &rect) = 0; @@ -101,7 +101,7 @@ public: }; -class Q_QUICK_EXPORT QSGGlyphNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGGlyphNode : public QSGGeometryNode { public: enum AntialiasingMode @@ -134,7 +134,7 @@ protected: QQuickItem *m_ownerElement; }; -class Q_QUICK_EXPORT QSGDistanceFieldGlyphConsumer +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldGlyphConsumer { public: virtual ~QSGDistanceFieldGlyphConsumer() {} @@ -142,7 +142,7 @@ public: virtual void invalidateGlyphs(const QVector &glyphs) = 0; }; -class Q_QUICK_EXPORT QSGDistanceFieldGlyphCache +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldGlyphCache { public: QSGDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font); diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index 35b97c3..30372c3 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -48,6 +48,7 @@ #include #include +#include #include #include @@ -75,7 +76,7 @@ class QOpenGLFramebufferObject; class QQuickTextureFactory; -class Q_QUICK_EXPORT QSGContext : public QObject +class Q_QUICK_PRIVATE_EXPORT QSGContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QSGContext) diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h index 2c4531c..bc056b9 100644 --- a/src/quick/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -42,7 +42,7 @@ #ifndef QSGCONTEXTPLUGIN_H #define QSGCONTEXTPLUGIN_H -#include +#include #include #include #include @@ -55,7 +55,7 @@ class QSGContext; class QQuickWindowManager; -struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface +struct Q_QUICK_PRIVATE_EXPORT QSGContextFactoryInterface : public QFactoryInterface { virtual QSGContext *create(const QString &key) const = 0; @@ -67,7 +67,7 @@ struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface "org.qt-project.Qt.QSGContextFactoryInterface" Q_DECLARE_INTERFACE(QSGContextFactoryInterface, QSGContextFactoryInterface_iid) -class Q_QUICK_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface +class Q_QUICK_PRIVATE_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface { Q_OBJECT Q_INTERFACES(QSGContextFactoryInterface:QFactoryInterface) diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h index 38cc649..5c38c1b 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache +class Q_QUICK_PRIVATE_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache { public: QSGDefaultDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font); diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h index 8b2654e..904f78a 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGDistanceFieldTextMaterial: public QSGMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldTextMaterial: public QSGMaterial { public: QSGDistanceFieldTextMaterial(); @@ -82,7 +82,7 @@ protected: qreal m_fontScale; }; -class Q_QUICK_EXPORT QSGDistanceFieldStyledTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldStyledTextMaterial : public QSGDistanceFieldTextMaterial { public: QSGDistanceFieldStyledTextMaterial(); @@ -99,7 +99,7 @@ protected: QColor m_styleColor; }; -class Q_QUICK_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial { public: QSGDistanceFieldOutlineTextMaterial(); @@ -109,7 +109,7 @@ public: virtual QSGMaterialShader *createShader() const; }; -class Q_QUICK_EXPORT QSGDistanceFieldShiftedStyleTextMaterial : public QSGDistanceFieldStyledTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldShiftedStyleTextMaterial : public QSGDistanceFieldStyledTextMaterial { public: QSGDistanceFieldShiftedStyleTextMaterial(); @@ -125,14 +125,14 @@ protected: QPointF m_shift; }; -class Q_QUICK_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial { public: virtual QSGMaterialType *type() const; virtual QSGMaterialShader *createShader() const; }; -class Q_QUICK_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial { public: virtual QSGMaterialType *type() const; diff --git a/src/quick/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h index 998f7ef..f101714 100644 --- a/src/quick/scenegraph/util/qsgareaallocator_p.h +++ b/src/quick/scenegraph/util/qsgareaallocator_p.h @@ -42,7 +42,7 @@ #ifndef AREAALLOCATOR_H #define AREAALLOCATOR_H -#include +#include #include QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QRect; class QPoint; struct QSGAreaAllocatorNode; -class Q_QUICK_EXPORT QSGAreaAllocator +class Q_QUICK_PRIVATE_EXPORT QSGAreaAllocator { public: QSGAreaAllocator(const QSize &size); diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h index 4ed4c28..329df98 100644 --- a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h +++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h @@ -55,7 +55,7 @@ class QOpenGLShaderProgram; class QSGDistanceFieldGlyphCache; class QSGContext; -class Q_QUICK_EXPORT QSGDistanceFieldGlyphCacheManager +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldGlyphCacheManager { public: QSGDistanceFieldGlyphCacheManager(); diff --git a/src/quick/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h index 24b4d26..7779b3d 100644 --- a/src/quick/scenegraph/util/qsgpainternode_p.h +++ b/src/quick/scenegraph/util/qsgpainternode_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QOpenGLFramebufferObject; class QOpenGLPaintDevice; -class Q_QUICK_EXPORT QSGPainterTexture : public QSGPlainTexture +class Q_QUICK_PRIVATE_EXPORT QSGPainterTexture : public QSGPlainTexture { public: QSGPainterTexture(); @@ -70,7 +70,7 @@ private: QRect m_dirty_rect; }; -class Q_QUICK_EXPORT QSGPainterNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGPainterNode : public QSGGeometryNode { public: QSGPainterNode(QQuickPaintedItem *item); diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h index 3d80035..a2c8bba 100644 --- a/src/quick/scenegraph/util/qsgtexture_p.h +++ b/src/quick/scenegraph/util/qsgtexture_p.h @@ -67,7 +67,7 @@ public: uint filterMode : 2; }; -class Q_QUICK_EXPORT QSGPlainTexture : public QSGTexture +class Q_QUICK_PRIVATE_EXPORT QSGPlainTexture : public QSGTexture { Q_OBJECT public: diff --git a/src/quick/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h index 0895dbd..fe14726 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial_p.h +++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h @@ -43,12 +43,13 @@ #define TEXTUREMATERIAL_P_H #include "qsgtexturematerial.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader +class Q_QUICK_PRIVATE_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader { public: virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect); diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h index 980a2f5..5a51319 100644 --- a/src/quick/util/qquickanimation_p.h +++ b/src/quick/util/qquickanimation_p.h @@ -167,7 +167,7 @@ protected: }; class QQuickScriptActionPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickScriptAction : public QQuickAbstractAnimation +class QQuickScriptAction : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickScriptAction) @@ -193,7 +193,7 @@ protected: }; class QQuickPropertyActionPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAction : public QQuickAbstractAnimation +class QQuickPropertyAction : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyAction) diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h index a502c70..754b2bb 100644 --- a/src/quick/util/qquickapplication_p.h +++ b/src/quick/util/qquickapplication_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QQuickApplicationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickApplication : public QObject +class Q_AUTOTEST_EXPORT QQuickApplication : public QObject { Q_OBJECT Q_PROPERTY(bool active READ active NOTIFY activeChanged) diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h index 1c25876..15018e0 100644 --- a/src/quick/util/qquickbehavior_p.h +++ b/src/quick/util/qquickbehavior_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QQuickAbstractAnimation; class QQuickBehaviorPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor +class Q_AUTOTEST_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor { Q_OBJECT Q_DECLARE_PRIVATE(QQuickBehavior) diff --git a/src/quick/util/qquickpixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h index 03f2e65..3695c30 100644 --- a/src/quick/util/qquickpixmapcache_p.h +++ b/src/quick/util/qquickpixmapcache_p.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include @@ -77,7 +77,7 @@ private: QImage im; }; -class Q_QUICK_EXPORT QQuickPixmap +class Q_QUICK_PRIVATE_EXPORT QQuickPixmap { Q_DECLARE_TR_FUNCTIONS(QQuickPixmap) public: diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h index 313a781..dcfdb7d 100644 --- a/src/quick/util/qquickpropertychanges_p.h +++ b/src/quick/util/qquickpropertychanges_p.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickPropertyChangesPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPropertyChanges : public QQuickStateOperation +class Q_AUTOTEST_EXPORT QQuickPropertyChanges : public QQuickStateOperation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyChanges) diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h index 8825a04..50559e8 100644 --- a/src/quick/util/qquicksmoothedanimation_p.h +++ b/src/quick/util/qquicksmoothedanimation_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QQmlProperty; class QQuickSmoothedAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickSmoothedAnimation : public QQuickNumberAnimation +class Q_AUTOTEST_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 03c586e..49fb884 100644 --- a/src/quick/util/qquickspringanimation_p.h +++ b/src/quick/util/qquickspringanimation_p.h @@ -52,7 +52,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickSpringAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation +class Q_AUTOTEST_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickSpringAnimation) diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h index 7dfc1da..cea5371 100644 --- a/src/quick/util/qquickstate_p.h +++ b/src/quick/util/qquickstate_p.h @@ -56,7 +56,7 @@ class QQuickActionEvent; class QQmlAbstractBinding; class QQmlBinding; class QQmlExpression; -class Q_QUICK_PRIVATE_EXPORT QQuickAction +class QQuickAction { public: QQuickAction(); @@ -115,7 +115,7 @@ public: class QQuickStateGroup; class QQuickState; class QQuickStateOperationPrivate; -class Q_QUICK_EXPORT QQuickStateOperation : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickStateOperation : public QObject { Q_OBJECT public: @@ -140,7 +140,7 @@ typedef QQuickStateOperation::ActionList QQuickStateActions; class QQuickTransition; class QQuickStatePrivate; -class Q_QUICK_EXPORT QQuickState : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickState : public QObject { Q_OBJECT diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h index 07e3c05..eaa536d 100644 --- a/src/quick/util/qquickstategroup_p.h +++ b/src/quick/util/qquickstategroup_p.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickStateGroupPrivate; -class Q_QUICK_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus +class Q_AUTOTEST_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/quick/util/qquicktimer_p.h b/src/quick/util/qquicktimer_p.h index b0354e4..be8c07a 100644 --- a/src/quick/util/qquicktimer_p.h +++ b/src/quick/util/qquicktimer_p.h @@ -53,7 +53,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickTimerPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickTimer : public QObject, public QQmlParserStatus +class Q_AUTOTEST_EXPORT QQuickTimer : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickTimer) diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h index 976439c..9eea5a7 100644 --- a/src/quick/util/qquicktransition_p.h +++ b/src/quick/util/qquicktransition_p.h @@ -57,7 +57,7 @@ class QQuickTransitionPrivate; class QQuickTransitionManager; class QQuickTransition; -class Q_QUICK_EXPORT QQuickTransitionInstance +class QQuickTransitionInstance { public: QQuickTransitionInstance(QQuickTransitionPrivate *transition, QAbstractAnimationJob *anim); @@ -74,7 +74,7 @@ private: friend class QQuickTransition; }; -class Q_QUICK_EXPORT QQuickTransition : public QObject +class Q_AUTOTEST_EXPORT QQuickTransition : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QQuickTransition) diff --git a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp index bf76ed9..be38829 100644 --- a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp +++ b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp @@ -294,19 +294,20 @@ void tst_qqmlcomponent::asyncHierarchy() QVERIFY(root != 0); // ensure that the parent-child relationship hierarchy is correct + // (use QQuickItem* for all children rather than types which are not publicly exported) QQuickItem *c1 = root->findChild("c1", Qt::FindDirectChildrenOnly); QVERIFY(c1); QQuickItem *c1c1 = c1->findChild("c1c1", Qt::FindDirectChildrenOnly); QVERIFY(c1c1); QQuickItem *c1c2 = c1->findChild("c1c2", Qt::FindDirectChildrenOnly); QVERIFY(c1c2); - QQuickRectangle *c1c2c3 = c1c2->findChild("c1c2c3", Qt::FindDirectChildrenOnly); + QQuickItem *c1c2c3 = c1c2->findChild("c1c2c3", Qt::FindDirectChildrenOnly); QVERIFY(c1c2c3); QQuickItem *c2 = root->findChild("c2", Qt::FindDirectChildrenOnly); QVERIFY(c2); - QQuickRectangle *c2c1 = c2->findChild("c2c1", Qt::FindDirectChildrenOnly); + QQuickItem *c2c1 = c2->findChild("c2c1", Qt::FindDirectChildrenOnly); QVERIFY(c2c1); - QQuickMouseArea *c2c1c1 = c2c1->findChild("c2c1c1", Qt::FindDirectChildrenOnly); + QQuickItem *c2c1c1 = c2c1->findChild("c2c1c1", Qt::FindDirectChildrenOnly); QVERIFY(c2c1c1); QQuickItem *c2c1c2 = c2c1->findChild("c2c1c2", Qt::FindDirectChildrenOnly); QVERIFY(c2c1c2);