diff options
92 files changed, 267 insertions, 267 deletions
diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index 6330b01bb1..04b47e3ae5 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -30,7 +30,7 @@ class QAnimationGroupJob; class QAnimationJobChangeListener; class QQmlAnimationTimer; -class Q_QML_PRIVATE_EXPORT QAbstractAnimationJob : public QInheritedListNode +class Q_QML_EXPORT QAbstractAnimationJob : public QInheritedListNode { Q_DISABLE_COPY(QAbstractAnimationJob) public: @@ -149,10 +149,10 @@ protected: friend class QQmlAnimationTimer; friend class QAnimationGroupJob; - friend Q_QML_PRIVATE_EXPORT QDebug operator<<(QDebug, const QAbstractAnimationJob *job); + friend Q_QML_EXPORT QDebug operator<<(QDebug, const QAbstractAnimationJob *job); }; -class Q_QML_PRIVATE_EXPORT QAnimationJobChangeListener +class Q_QML_EXPORT QAnimationJobChangeListener { public: virtual ~QAnimationJobChangeListener(); @@ -162,7 +162,7 @@ public: virtual void animationCurrentTimeChanged(QAbstractAnimationJob *, int) {} }; -class Q_QML_PRIVATE_EXPORT QQmlAnimationTimer : public QAbstractAnimationTimer +class Q_QML_EXPORT QQmlAnimationTimer : public QAbstractAnimationTimer { Q_OBJECT private: @@ -223,7 +223,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractAnimationJob::ChangeTypes) -Q_QML_PRIVATE_EXPORT QDebug operator<<(QDebug, const QAbstractAnimationJob *job); +Q_QML_EXPORT QDebug operator<<(QDebug, const QAbstractAnimationJob *job); QT_END_NAMESPACE diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h index 3bfaf030a6..d276f63868 100644 --- a/src/qml/animations/qanimationgroupjob_p.h +++ b/src/qml/animations/qanimationgroupjob_p.h @@ -23,7 +23,7 @@ QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob +class Q_QML_EXPORT QAnimationGroupJob : public QAbstractAnimationJob { Q_DISABLE_COPY(QAnimationGroupJob) public: diff --git a/src/qml/animations/qcontinuinganimationgroupjob_p.h b/src/qml/animations/qcontinuinganimationgroupjob_p.h index d1d621b684..1112262d4b 100644 --- a/src/qml/animations/qcontinuinganimationgroupjob_p.h +++ b/src/qml/animations/qcontinuinganimationgroupjob_p.h @@ -21,7 +21,7 @@ QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QContinuingAnimationGroupJob : public QAnimationGroupJob +class Q_QML_EXPORT QContinuingAnimationGroupJob : public QAnimationGroupJob { Q_DISABLE_COPY(QContinuingAnimationGroupJob) public: diff --git a/src/qml/animations/qparallelanimationgroupjob_p.h b/src/qml/animations/qparallelanimationgroupjob_p.h index c86806969f..c4708a8e5d 100644 --- a/src/qml/animations/qparallelanimationgroupjob_p.h +++ b/src/qml/animations/qparallelanimationgroupjob_p.h @@ -21,7 +21,7 @@ QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QParallelAnimationGroupJob : public QAnimationGroupJob +class Q_QML_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 166dc06a6f..e08186e165 100644 --- a/src/qml/animations/qpauseanimationjob_p.h +++ b/src/qml/animations/qpauseanimationjob_p.h @@ -21,7 +21,7 @@ QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QPauseAnimationJob : public QAbstractAnimationJob +class Q_QML_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 c963043a77..c7d4319b4d 100644 --- a/src/qml/animations/qsequentialanimationgroupjob_p.h +++ b/src/qml/animations/qsequentialanimationgroupjob_p.h @@ -22,7 +22,7 @@ QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE class QPauseAnimationJob; -class Q_QML_PRIVATE_EXPORT QSequentialAnimationGroupJob : public QAnimationGroupJob +class Q_QML_EXPORT QSequentialAnimationGroupJob : public QAnimationGroupJob { Q_DISABLE_COPY(QSequentialAnimationGroupJob) public: diff --git a/src/qml/common/qqmltranslation_p.h b/src/qml/common/qqmltranslation_p.h index 4a565ff5f7..9849203abe 100644 --- a/src/qml/common/qqmltranslation_p.h +++ b/src/qml/common/qqmltranslation_p.h @@ -21,10 +21,10 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlTranslation +class Q_QML_EXPORT QQmlTranslation { public: - class Q_QML_PRIVATE_EXPORT QsTrData + class Q_QML_EXPORT QsTrData { QByteArray context; QByteArray text; @@ -39,7 +39,7 @@ public: QString idForQmlDebug() const; }; - class Q_QML_PRIVATE_EXPORT QsTrIdData + class Q_QML_EXPORT QsTrIdData { QByteArray id; int number; diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h index 70e9f9e7a2..4dde924379 100644 --- a/src/qml/compiler/qv4instr_moth_p.h +++ b/src/qml/compiler/qv4instr_moth_p.h @@ -497,7 +497,7 @@ inline bool operator!=(const StackSlot &l, const StackSlot &r) { return l.stackS // When making changes to the instructions, make sure to bump QV4_DATA_STRUCTURE_VERSION in qv4compileddata_p.h -Q_QML_PRIVATE_EXPORT +Q_QML_EXPORT QString dumpBytecode( const char *bytecode, int len, int nLocals, int nFormals, int beginOffset, int endOffset, const QVector<CompiledData::CodeOffsetToLineAndStatement> &lineAndStatementNumberMapping = diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h index bd59c41aa7..c95eee949f 100644 --- a/src/qml/debugger/qqmlabstractprofileradapter_p.h +++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE QT_REQUIRE_CONFIG(qml_debug); class QQmlProfilerService; -class Q_QML_PRIVATE_EXPORT QQmlAbstractProfilerAdapter : public QObject, public QQmlProfilerDefinitions { +class Q_QML_EXPORT QQmlAbstractProfilerAdapter : public QObject, public QQmlProfilerDefinitions { Q_OBJECT public: @@ -71,7 +71,7 @@ private: quint64 featuresEnabled; }; -class Q_QML_PRIVATE_EXPORT QQmlAbstractProfilerAdapterFactory : public QObject +class Q_QML_EXPORT QQmlAbstractProfilerAdapterFactory : public QObject { Q_OBJECT public: diff --git a/src/qml/debugger/qqmldebugconnector_p.h b/src/qml/debugger/qqmldebugconnector_p.h index 39d042202d..d021020bf4 100644 --- a/src/qml/debugger/qqmldebugconnector_p.h +++ b/src/qml/debugger/qqmldebugconnector_p.h @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE #if !QT_CONFIG(qml_debug) -class Q_QML_PRIVATE_EXPORT QQmlDebugConnector +class Q_QML_EXPORT QQmlDebugConnector { virtual ~QQmlDebugConnector() = default; // don't break 'override' on ~QQmlDebugServer public: @@ -50,7 +50,7 @@ public: #else class QQmlDebugService; -class Q_QML_PRIVATE_EXPORT QQmlDebugConnector : public QObject +class Q_QML_EXPORT QQmlDebugConnector : public QObject { Q_OBJECT public: @@ -87,7 +87,7 @@ protected: static int s_dataStreamVersion; }; -class Q_QML_PRIVATE_EXPORT QQmlDebugConnectorFactory : public QObject { +class Q_QML_EXPORT QQmlDebugConnectorFactory : public QObject { Q_OBJECT public: virtual QQmlDebugConnector *create(const QString &key) = 0; diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h index cba4be82b0..04e8b95f67 100644 --- a/src/qml/debugger/qqmldebugserver_p.h +++ b/src/qml/debugger/qqmldebugserver_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlDebugServer : public QQmlDebugConnector +class Q_QML_EXPORT QQmlDebugServer : public QQmlDebugConnector { Q_OBJECT public: diff --git a/src/qml/debugger/qqmldebugserverconnection_p.h b/src/qml/debugger/qqmldebugserverconnection_p.h index 4a12583d19..c7ec68727c 100644 --- a/src/qml/debugger/qqmldebugserverconnection_p.h +++ b/src/qml/debugger/qqmldebugserverconnection_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QQmlDebugServer; -class Q_QML_PRIVATE_EXPORT QQmlDebugServerConnection : public QObject +class Q_QML_EXPORT QQmlDebugServerConnection : public QObject { Q_OBJECT public: @@ -37,7 +37,7 @@ public: virtual void flush() = 0; }; -class Q_QML_PRIVATE_EXPORT QQmlDebugServerConnectionFactory : public QObject +class Q_QML_EXPORT QQmlDebugServerConnectionFactory : public QObject { Q_OBJECT public: diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index b92c61146c..5970e89038 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE class QJSEngine; class QQmlDebugServicePrivate; -class Q_QML_PRIVATE_EXPORT QQmlDebugService : public QObject +class Q_QML_EXPORT QQmlDebugService : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QQmlDebugService) diff --git a/src/qml/debugger/qqmldebugservicefactory_p.h b/src/qml/debugger/qqmldebugservicefactory_p.h index 6a1e85dad6..e9e4069efb 100644 --- a/src/qml/debugger/qqmldebugservicefactory_p.h +++ b/src/qml/debugger/qqmldebugservicefactory_p.h @@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlDebugServiceFactory : public QObject +class Q_QML_EXPORT QQmlDebugServiceFactory : public QObject { Q_OBJECT public: diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h index 7c0b736463..cd9022b497 100644 --- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h +++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h @@ -78,7 +78,7 @@ public: #else -class Q_QML_PRIVATE_EXPORT QV4DebugService : public QQmlDebugService +class Q_QML_EXPORT QV4DebugService : public QQmlDebugService { Q_OBJECT public: @@ -96,7 +96,7 @@ protected: }; class QQmlAbstractProfilerAdapter; -class Q_QML_PRIVATE_EXPORT QQmlProfilerService : public QQmlDebugService +class Q_QML_EXPORT QQmlProfilerService : public QQmlDebugService { Q_OBJECT public: @@ -120,7 +120,7 @@ protected: QQmlDebugService(s_key, version, parent) {} }; -class Q_QML_PRIVATE_EXPORT QQmlEngineDebugService : public QQmlDebugService +class Q_QML_EXPORT QQmlEngineDebugService : public QQmlDebugService { Q_OBJECT public: @@ -160,7 +160,7 @@ struct TranslationBindingInformation quint32 column; }; -class Q_QML_PRIVATE_EXPORT QQmlDebugTranslationService : public QQmlDebugService +class Q_QML_EXPORT QQmlDebugTranslationService : public QQmlDebugService { Q_OBJECT public: @@ -178,7 +178,7 @@ protected: }; #endif //QT_CONFIG(translation) -class Q_QML_PRIVATE_EXPORT QQmlInspectorService : public QQmlDebugService +class Q_QML_EXPORT QQmlInspectorService : public QQmlDebugService { Q_OBJECT public: @@ -197,7 +197,7 @@ protected: QQmlDebugService(s_key, version, parent) {} }; -class Q_QML_PRIVATE_EXPORT QDebugMessageService : public QQmlDebugService +class Q_QML_EXPORT QDebugMessageService : public QQmlDebugService { Q_OBJECT public: @@ -214,7 +214,7 @@ protected: QQmlDebugService(s_key, version, parent) {} }; -class Q_QML_PRIVATE_EXPORT QQmlEngineControlService : public QQmlDebugService +class Q_QML_EXPORT QQmlEngineControlService : public QQmlDebugService { Q_OBJECT public: @@ -230,7 +230,7 @@ protected: }; -class Q_QML_PRIVATE_EXPORT QQmlNativeDebugService : public QQmlDebugService +class Q_QML_EXPORT QQmlNativeDebugService : public QQmlDebugService { Q_OBJECT public: diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index 8ea5c459e4..2cf0e85760 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -112,7 +112,7 @@ struct Q_AUTOTEST_EXPORT QQmlProfilerData : public QQmlProfilerDefinitions Q_DECLARE_TYPEINFO(QQmlProfilerData, Q_RELOCATABLE_TYPE); -class Q_QML_PRIVATE_EXPORT QQmlProfiler : public QObject, public QQmlProfilerDefinitions { +class Q_QML_EXPORT QQmlProfiler : public QObject, public QQmlProfilerDefinitions { Q_OBJECT public: diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h index bee2f9d79c..735dae8d81 100644 --- a/src/qml/jsapi/qjsengine_p.h +++ b/src/qml/jsapi/qjsengine_p.h @@ -30,7 +30,7 @@ namespace QV4 { struct ExecutionEngine; } -class Q_QML_PRIVATE_EXPORT QJSEnginePrivate : public QObjectPrivate +class Q_QML_EXPORT QJSEnginePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QJSEngine) diff --git a/src/qml/jsruntime/qv4arraybuffer_p.h b/src/qml/jsruntime/qv4arraybuffer_p.h index b955618cbe..aafa3c6335 100644 --- a/src/qml/jsruntime/qv4arraybuffer_p.h +++ b/src/qml/jsruntime/qv4arraybuffer_p.h @@ -32,7 +32,7 @@ struct ArrayBufferCtor : SharedArrayBufferCtor { void init(QV4::ExecutionContext *scope); }; -struct Q_QML_PRIVATE_EXPORT SharedArrayBuffer : Object { +struct Q_QML_EXPORT SharedArrayBuffer : Object { void init(size_t length); void init(const QByteArray& array); void destroy(); @@ -68,7 +68,7 @@ private: bool isShared; }; -struct Q_QML_PRIVATE_EXPORT ArrayBuffer : SharedArrayBuffer { +struct Q_QML_EXPORT ArrayBuffer : SharedArrayBuffer { void init(size_t length) { SharedArrayBuffer::init(length); setSharedArrayBuffer(false); @@ -98,7 +98,7 @@ struct ArrayBufferCtor : SharedArrayBufferCtor static ReturnedValue method_isView(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); }; -struct Q_QML_PRIVATE_EXPORT SharedArrayBuffer : Object +struct Q_QML_EXPORT SharedArrayBuffer : Object { V4_OBJECT2(SharedArrayBuffer, Object) V4_NEEDS_DESTROY @@ -115,7 +115,7 @@ struct Q_QML_PRIVATE_EXPORT SharedArrayBuffer : Object bool isSharedArrayBuffer() const { return d()->isSharedArrayBuffer(); } }; -struct Q_QML_PRIVATE_EXPORT ArrayBuffer : SharedArrayBuffer +struct Q_QML_EXPORT ArrayBuffer : SharedArrayBuffer { V4_OBJECT2(ArrayBuffer, SharedArrayBuffer) V4_NEEDS_DESTROY diff --git a/src/qml/jsruntime/qv4dateobject_p.h b/src/qml/jsruntime/qv4dateobject_p.h index d7d0cece1a..7debcff4e9 100644 --- a/src/qml/jsruntime/qv4dateobject_p.h +++ b/src/qml/jsruntime/qv4dateobject_p.h @@ -202,7 +202,7 @@ struct DateObject: ReferenceObject { void setDate(double date) { d()->setDate(date); } double date() const { return d()->date(); } - Q_QML_PRIVATE_EXPORT QDateTime toQDateTime() const; + Q_QML_EXPORT QDateTime toQDateTime() const; QString toString() const; static QString dateTimeToString(const QDateTime &dateTime, ExecutionEngine *engine); diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h index b4379707f3..49de05a227 100644 --- a/src/qml/jsruntime/qv4executablecompilationunit_p.h +++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h @@ -90,7 +90,7 @@ static_assert(offsetof(CompilationUnitRuntimeData, runtimeRegularExpressions) == static_assert(offsetof(CompilationUnitRuntimeData, runtimeClasses) == offsetof(CompilationUnitRuntimeData, runtimeRegularExpressions) + sizeof(const StaticValue *)); static_assert(offsetof(CompilationUnitRuntimeData, imports) == offsetof(CompilationUnitRuntimeData, runtimeClasses) + sizeof(const StaticValue *)); -class Q_QML_PRIVATE_EXPORT ExecutableCompilationUnit final +class Q_QML_EXPORT ExecutableCompilationUnit final : public CompilationUnitRuntimeData, public QQmlRefCounted<ExecutableCompilationUnit> { diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index 6b05c221ea..573848f62a 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -51,14 +51,14 @@ DECLARE_HEAP_OBJECT(FunctionObject, Object) { return jsConstruct != nullptr; } - Q_QML_PRIVATE_EXPORT void init( + Q_QML_EXPORT void init( QV4::ExecutionContext *scope, QV4::String *name, VTable::Call call, VTable::CallWithMetaTypes callWithMetaTypes = nullptr); - Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, QV4::String *name = nullptr); - Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, QV4::Function *function, QV4::String *n = nullptr); - Q_QML_PRIVATE_EXPORT void init(QV4::ExecutionContext *scope, const QString &name); - Q_QML_PRIVATE_EXPORT void init(); - Q_QML_PRIVATE_EXPORT void destroy(); + Q_QML_EXPORT void init(QV4::ExecutionContext *scope, QV4::String *name = nullptr); + Q_QML_EXPORT void init(QV4::ExecutionContext *scope, QV4::Function *function, QV4::String *n = nullptr); + Q_QML_EXPORT void init(QV4::ExecutionContext *scope, const QString &name); + Q_QML_EXPORT void init(); + Q_QML_EXPORT void destroy(); void setFunction(Function *f); @@ -232,7 +232,7 @@ struct FunctionPrototype: FunctionObject static ReturnedValue method_hasInstance(const FunctionObject *, const Value *thisObject, const Value *argv, int argc); }; -struct Q_QML_PRIVATE_EXPORT IndexedBuiltinFunction : FunctionObject +struct Q_QML_EXPORT IndexedBuiltinFunction : FunctionObject { V4_OBJECT2(IndexedBuiltinFunction, FunctionObject) }; diff --git a/src/qml/jsruntime/qv4identifierhash_p.h b/src/qml/jsruntime/qv4identifierhash_p.h index ad3c179502..6c77a78f85 100644 --- a/src/qml/jsruntime/qv4identifierhash_p.h +++ b/src/qml/jsruntime/qv4identifierhash_p.h @@ -24,7 +24,7 @@ namespace QV4 { struct IdentifierHashEntry; struct IdentifierHashData; -struct Q_QML_PRIVATE_EXPORT IdentifierHash +struct Q_QML_EXPORT IdentifierHash { IdentifierHash() = default; IdentifierHash(ExecutionEngine *engine); diff --git a/src/qml/jsruntime/qv4identifiertable_p.h b/src/qml/jsruntime/qv4identifiertable_p.h index d5c44ca1dd..2ecd4a7294 100644 --- a/src/qml/jsruntime/qv4identifiertable_p.h +++ b/src/qml/jsruntime/qv4identifiertable_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { -struct Q_QML_PRIVATE_EXPORT IdentifierTable +struct Q_QML_EXPORT IdentifierTable { ExecutionEngine *engine; diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h index d7b346598b..d14579b4ce 100644 --- a/src/qml/jsruntime/qv4internalclass_p.h +++ b/src/qml/jsruntime/qv4internalclass_p.h @@ -333,7 +333,7 @@ struct InternalClass : Base { void init(InternalClass *other); void destroy(); - Q_QML_PRIVATE_EXPORT ReturnedValue keyAt(uint index) const; + Q_QML_EXPORT ReturnedValue keyAt(uint index) const; Q_REQUIRED_RESULT InternalClass *nonExtensible(); Q_REQUIRED_RESULT InternalClass *locked(); diff --git a/src/qml/jsruntime/qv4jscall_p.h b/src/qml/jsruntime/qv4jscall_p.h index fd25466d8b..e8896ce19d 100644 --- a/src/qml/jsruntime/qv4jscall_p.h +++ b/src/qml/jsruntime/qv4jscall_p.h @@ -234,7 +234,7 @@ enum CoercionProblem InvalidListType }; -Q_QML_PRIVATE_EXPORT void warnAboutCoercionToVoid( +Q_QML_EXPORT void warnAboutCoercionToVoid( ExecutionEngine *engine, const Value &value, CoercionProblem problem); inline ReturnedValue coerceListType( diff --git a/src/qml/jsruntime/qv4lookup_p.h b/src/qml/jsruntime/qv4lookup_p.h index 05f784612f..e4bb08d2f6 100644 --- a/src/qml/jsruntime/qv4lookup_p.h +++ b/src/qml/jsruntime/qv4lookup_p.h @@ -31,7 +31,7 @@ namespace Heap { // Note: We cannot hide the copy ctor and assignment operator of this class because it needs to // be trivially copyable. But you should never ever copy it. There are refcounted members // in there. -struct Q_QML_PRIVATE_EXPORT Lookup { +struct Q_QML_EXPORT Lookup { union { ReturnedValue (*getter)(Lookup *l, ExecutionEngine *engine, const Value &object); ReturnedValue (*globalGetter)(Lookup *l, ExecutionEngine *engine); diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 299d4b4196..c5f5fbff8e 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -69,7 +69,7 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} static Heap::InternalClass *defaultInternalClass(QV4::EngineBase *e) \ { return e->internalClasses(QV4::EngineBase::Class_##c); } -struct Q_QML_PRIVATE_EXPORT Managed : Value, VTableBase +struct Q_QML_EXPORT Managed : Value, VTableBase { V4_MANAGED_ITSELF(Base, Managed) enum { diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index acfc7d3a47..55d18fad52 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -377,7 +377,7 @@ private: friend struct ObjectPrototype; }; -struct Q_QML_PRIVATE_EXPORT ObjectOwnPropertyKeyIterator : OwnPropertyKeyIterator +struct Q_QML_EXPORT ObjectOwnPropertyKeyIterator : OwnPropertyKeyIterator { uint arrayIndex = 0; uint memberIndex = 0; diff --git a/src/qml/jsruntime/qv4objectproto_p.h b/src/qml/jsruntime/qv4objectproto_p.h index fa12f77a6a..d152bfd175 100644 --- a/src/qml/jsruntime/qv4objectproto_p.h +++ b/src/qml/jsruntime/qv4objectproto_p.h @@ -38,7 +38,7 @@ struct ObjectCtor: FunctionObject static ReturnedValue virtualCall(const FunctionObject *m, const Value *thisObject, const Value *argv, int argc); }; -struct Q_QML_PRIVATE_EXPORT ObjectPrototype: Object +struct Q_QML_EXPORT ObjectPrototype: Object { void init(ExecutionEngine *engine, Object *ctor); diff --git a/src/qml/jsruntime/qv4promiseobject_p.h b/src/qml/jsruntime/qv4promiseobject_p.h index 1c11ebbfd6..ca31f00881 100644 --- a/src/qml/jsruntime/qv4promiseobject_p.h +++ b/src/qml/jsruntime/qv4promiseobject_p.h @@ -181,7 +181,7 @@ struct PromiseExecutionState : Object V4_OBJECT2(PromiseExecutionState, Object) }; -struct Q_QML_PRIVATE_EXPORT PromiseObject : Object +struct Q_QML_EXPORT PromiseObject : Object { V4_OBJECT2(PromiseObject, Object) V4_NEEDS_DESTROY diff --git a/src/qml/jsruntime/qv4propertykey_p.h b/src/qml/jsruntime/qv4propertykey_p.h index d6d15e402d..f3b05ee0d8 100644 --- a/src/qml/jsruntime/qv4propertykey_p.h +++ b/src/qml/jsruntime/qv4propertykey_p.h @@ -97,11 +97,11 @@ public: return static_cast<StringOrSymbol *>(val.m()); } - Q_QML_PRIVATE_EXPORT bool isString() const; - Q_QML_PRIVATE_EXPORT bool isSymbol() const; + Q_QML_EXPORT bool isString() const; + Q_QML_EXPORT bool isSymbol() const; bool isCanonicalNumericIndexString() const; - Q_QML_PRIVATE_EXPORT QString toQString() const; + Q_QML_EXPORT QString toQString() const; Heap::StringOrSymbol *toStringOrSymbol(ExecutionEngine *e); quint64 id() const { return val._val; } static PropertyKey fromId(quint64 id) { diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h index 31e13f5984..8d52300013 100644 --- a/src/qml/jsruntime/qv4regexpobject_p.h +++ b/src/qml/jsruntime/qv4regexpobject_p.h @@ -56,7 +56,7 @@ DECLARE_HEAP_OBJECT(RegExpCtor, FunctionObject) { } -struct Q_QML_PRIVATE_EXPORT RegExpObject: Object { +struct Q_QML_EXPORT RegExpObject: Object { V4_OBJECT2(RegExpObject, Object) Q_MANAGED_TYPE(RegExpObject) V4_INTERNALCLASS(RegExpObject) diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h index 40994633f0..a012728cd9 100644 --- a/src/qml/jsruntime/qv4runtime_p.h +++ b/src/qml/jsruntime/qv4runtime_p.h @@ -58,7 +58,7 @@ enum TypeHint { STRING_HINT }; -struct Q_QML_PRIVATE_EXPORT RuntimeHelpers { +struct Q_QML_EXPORT RuntimeHelpers { static ReturnedValue objectDefaultValue(const Object *object, int typeHint); static ReturnedValue toPrimitive(const Value &value, TypeHint typeHint); static ReturnedValue ordinaryToPrimitive(ExecutionEngine *engine, const Object *object, String *typeHint); diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h index 797de7e13f..fdee6ac580 100644 --- a/src/qml/jsruntime/qv4runtimeapi_p.h +++ b/src/qml/jsruntime/qv4runtimeapi_p.h @@ -23,7 +23,7 @@ namespace QV4 { typedef uint Bool; -struct Q_QML_PRIVATE_EXPORT Runtime { +struct Q_QML_EXPORT Runtime { typedef ReturnedValue (*UnaryOperation)(const Value &value); typedef ReturnedValue (*BinaryOperation)(const Value &left, const Value &right); typedef ReturnedValue (*BinaryOperationContext)(ExecutionEngine *, const Value &left, const Value &right); @@ -47,414 +47,414 @@ struct Q_QML_PRIVATE_EXPORT Runtime { LastArgumentIsOutputValue::Yes>; /* call */ - struct Q_QML_PRIVATE_EXPORT CallGlobalLookup : Method<Throws::Yes> + struct Q_QML_EXPORT CallGlobalLookup : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, uint, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallQmlContextPropertyLookup : Method<Throws::Yes> + struct Q_QML_EXPORT CallQmlContextPropertyLookup : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, uint, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallName : Method<Throws::Yes> + struct Q_QML_EXPORT CallName : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, int, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallProperty : Method<Throws::Yes> + struct Q_QML_EXPORT CallProperty : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, int, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallPropertyLookup : Method<Throws::Yes> + struct Q_QML_EXPORT CallPropertyLookup : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, uint, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallValue : Method<Throws::Yes> + struct Q_QML_EXPORT CallValue : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallWithReceiver : Method<Throws::Yes> + struct Q_QML_EXPORT CallWithReceiver : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallPossiblyDirectEval : Method<Throws::Yes> + struct Q_QML_EXPORT CallPossiblyDirectEval : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CallWithSpread : Method<Throws::Yes> + struct Q_QML_EXPORT CallWithSpread : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT TailCall : Method<Throws::Yes> + struct Q_QML_EXPORT TailCall : Method<Throws::Yes> { static ReturnedValue call(JSTypesStackFrame *, ExecutionEngine *engine); }; /* construct */ - struct Q_QML_PRIVATE_EXPORT Construct : Method<Throws::Yes> + struct Q_QML_EXPORT Construct : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT ConstructWithSpread : Method<Throws::Yes> + struct Q_QML_EXPORT ConstructWithSpread : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value[], int); }; /* load & store */ - struct Q_QML_PRIVATE_EXPORT StoreNameStrict : Method<Throws::Yes> + struct Q_QML_EXPORT StoreNameStrict : Method<Throws::Yes> { static void call(ExecutionEngine *, int, const Value &); }; - struct Q_QML_PRIVATE_EXPORT StoreNameSloppy : Method<Throws::Yes> + struct Q_QML_EXPORT StoreNameSloppy : Method<Throws::Yes> { static void call(ExecutionEngine *, int, const Value &); }; - struct Q_QML_PRIVATE_EXPORT StoreProperty : Method<Throws::Yes> + struct Q_QML_EXPORT StoreProperty : Method<Throws::Yes> { static void call(ExecutionEngine *, const Value &, int, const Value &); }; - struct Q_QML_PRIVATE_EXPORT StoreElement : Method<Throws::Yes> + struct Q_QML_EXPORT StoreElement : Method<Throws::Yes> { static void call(ExecutionEngine *, const Value &, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT LoadProperty : Method<Throws::Yes> + struct Q_QML_EXPORT LoadProperty : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, int); }; - struct Q_QML_PRIVATE_EXPORT LoadName : Method<Throws::Yes> + struct Q_QML_EXPORT LoadName : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, int); }; - struct Q_QML_PRIVATE_EXPORT LoadElement : Method<Throws::Yes> + struct Q_QML_EXPORT LoadElement : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT LoadSuperProperty : Method<Throws::Yes> + struct Q_QML_EXPORT LoadSuperProperty : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT StoreSuperProperty : Method<Throws::Yes> + struct Q_QML_EXPORT StoreSuperProperty : Method<Throws::Yes> { static void call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT LoadSuperConstructor : Method<Throws::Yes> + struct Q_QML_EXPORT LoadSuperConstructor : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT LoadGlobalLookup : Method<Throws::Yes> + struct Q_QML_EXPORT LoadGlobalLookup : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, Function *, int); }; - struct Q_QML_PRIVATE_EXPORT LoadQmlContextPropertyLookup : Method<Throws::Yes> + struct Q_QML_EXPORT LoadQmlContextPropertyLookup : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, uint); }; - struct Q_QML_PRIVATE_EXPORT GetLookup : Method<Throws::Yes> + struct Q_QML_EXPORT GetLookup : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, Function *, const Value &, int); }; - struct Q_QML_PRIVATE_EXPORT SetLookupStrict : Method<Throws::Yes> + struct Q_QML_EXPORT SetLookupStrict : Method<Throws::Yes> { static void call(Function *, const Value &, int, const Value &); }; - struct Q_QML_PRIVATE_EXPORT SetLookupSloppy : Method<Throws::Yes> + struct Q_QML_EXPORT SetLookupSloppy : Method<Throws::Yes> { static void call(Function *, const Value &, int, const Value &); }; /* typeof */ - struct Q_QML_PRIVATE_EXPORT TypeofValue : PureMethod + struct Q_QML_EXPORT TypeofValue : PureMethod { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT TypeofName : Method<Throws::No> + struct Q_QML_EXPORT TypeofName : Method<Throws::No> { static ReturnedValue call(ExecutionEngine *, int); }; /* delete */ - struct Q_QML_PRIVATE_EXPORT DeleteProperty_NoThrow : Method<Throws::No> + struct Q_QML_EXPORT DeleteProperty_NoThrow : Method<Throws::No> { static Bool call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT DeleteProperty : Method<Throws::Yes> + struct Q_QML_EXPORT DeleteProperty : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, Function *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT DeleteName_NoThrow : Method<Throws::No> + struct Q_QML_EXPORT DeleteName_NoThrow : Method<Throws::No> { static Bool call(ExecutionEngine *, int); }; - struct Q_QML_PRIVATE_EXPORT DeleteName : Method<Throws::Yes> + struct Q_QML_EXPORT DeleteName : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, Function *, int); }; /* exceptions & scopes */ - struct Q_QML_PRIVATE_EXPORT ThrowException : Method<Throws::Yes> + struct Q_QML_EXPORT ThrowException : Method<Throws::Yes> { static void call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT PushCallContext : Method<Throws::No, ChangesContext::Yes> + struct Q_QML_EXPORT PushCallContext : Method<Throws::No, ChangesContext::Yes> { static void call(JSTypesStackFrame *); }; - struct Q_QML_PRIVATE_EXPORT PushWithContext : Method<Throws::Yes, ChangesContext::Yes> + struct Q_QML_EXPORT PushWithContext : Method<Throws::Yes, ChangesContext::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT PushCatchContext : Method<Throws::No, ChangesContext::Yes> + struct Q_QML_EXPORT PushCatchContext : Method<Throws::No, ChangesContext::Yes> { static void call(ExecutionEngine *, int, int); }; - struct Q_QML_PRIVATE_EXPORT PushBlockContext : Method<Throws::No, ChangesContext::Yes> + struct Q_QML_EXPORT PushBlockContext : Method<Throws::No, ChangesContext::Yes> { static void call(ExecutionEngine *, int); }; - struct Q_QML_PRIVATE_EXPORT CloneBlockContext : Method<Throws::No, ChangesContext::Yes> + struct Q_QML_EXPORT CloneBlockContext : Method<Throws::No, ChangesContext::Yes> { static void call(ExecutionEngine *); }; - struct Q_QML_PRIVATE_EXPORT PushScriptContext : Method<Throws::No, ChangesContext::Yes> + struct Q_QML_EXPORT PushScriptContext : Method<Throws::No, ChangesContext::Yes> { static void call(ExecutionEngine *, int); }; - struct Q_QML_PRIVATE_EXPORT PopScriptContext : Method<Throws::No, ChangesContext::Yes> + struct Q_QML_EXPORT PopScriptContext : Method<Throws::No, ChangesContext::Yes> { static void call(ExecutionEngine *); }; - struct Q_QML_PRIVATE_EXPORT ThrowReferenceError : Method<Throws::Yes> + struct Q_QML_EXPORT ThrowReferenceError : Method<Throws::Yes> { static void call(ExecutionEngine *, int); }; - struct Q_QML_PRIVATE_EXPORT ThrowOnNullOrUndefined : Method<Throws::Yes> + struct Q_QML_EXPORT ThrowOnNullOrUndefined : Method<Throws::Yes> { static void call(ExecutionEngine *, const Value &); }; /* closures */ - struct Q_QML_PRIVATE_EXPORT Closure : Method<Throws::No> + struct Q_QML_EXPORT Closure : Method<Throws::No> { static ReturnedValue call(ExecutionEngine *, int); }; /* Function header */ - struct Q_QML_PRIVATE_EXPORT ConvertThisToObject : Method<Throws::Yes> + struct Q_QML_EXPORT ConvertThisToObject : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT DeclareVar : Method<Throws::Yes> + struct Q_QML_EXPORT DeclareVar : Method<Throws::Yes> { static void call(ExecutionEngine *, Bool, int); }; - struct Q_QML_PRIVATE_EXPORT CreateMappedArgumentsObject : Method<Throws::No> + struct Q_QML_EXPORT CreateMappedArgumentsObject : Method<Throws::No> { static ReturnedValue call(ExecutionEngine *); }; - struct Q_QML_PRIVATE_EXPORT CreateUnmappedArgumentsObject : Method<Throws::No> + struct Q_QML_EXPORT CreateUnmappedArgumentsObject : Method<Throws::No> { static ReturnedValue call(ExecutionEngine *); }; - struct Q_QML_PRIVATE_EXPORT CreateRestParameter : PureMethod + struct Q_QML_EXPORT CreateRestParameter : PureMethod { static ReturnedValue call(ExecutionEngine *, int); }; /* literals */ - struct Q_QML_PRIVATE_EXPORT ArrayLiteral : Method<Throws::Yes> + struct Q_QML_EXPORT ArrayLiteral : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, Value[], uint); }; - struct Q_QML_PRIVATE_EXPORT ObjectLiteral : Method<Throws::Yes> + struct Q_QML_EXPORT ObjectLiteral : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, int, Value[], int); }; - struct Q_QML_PRIVATE_EXPORT CreateClass : Method<Throws::Yes> + struct Q_QML_EXPORT CreateClass : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, int, const Value &, Value[]); }; /* for-in, for-of and array destructuring */ - struct Q_QML_PRIVATE_EXPORT GetIterator : Method<Throws::Yes> + struct Q_QML_EXPORT GetIterator : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, int); }; - struct Q_QML_PRIVATE_EXPORT IteratorNext : IteratorMethod + struct Q_QML_EXPORT IteratorNext : IteratorMethod { static ReturnedValue call(ExecutionEngine *, const Value &, Value *); }; - struct Q_QML_PRIVATE_EXPORT IteratorNextForYieldStar : IteratorMethod + struct Q_QML_EXPORT IteratorNextForYieldStar : IteratorMethod { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &, Value *); }; - struct Q_QML_PRIVATE_EXPORT IteratorClose : Method<Throws::No> + struct Q_QML_EXPORT IteratorClose : Method<Throws::No> { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT DestructureRestElement : Method<Throws::Yes> + struct Q_QML_EXPORT DestructureRestElement : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; /* conversions */ - struct Q_QML_PRIVATE_EXPORT ToObject : Method<Throws::Yes> + struct Q_QML_EXPORT ToObject : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; - struct Q_QML_PRIVATE_EXPORT ToBoolean : PureMethod + struct Q_QML_EXPORT ToBoolean : PureMethod { static Bool call(const Value &); }; - struct Q_QML_PRIVATE_EXPORT ToNumber : Method<Throws::Yes> + struct Q_QML_EXPORT ToNumber : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &); }; /* unary operators */ - struct Q_QML_PRIVATE_EXPORT UMinus : Method<Throws::Yes> + struct Q_QML_EXPORT UMinus : Method<Throws::Yes> { static ReturnedValue call(const Value &); }; /* binary operators */ - struct Q_QML_PRIVATE_EXPORT Instanceof : Method<Throws::Yes> + struct Q_QML_EXPORT Instanceof : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT As : Method<Throws::No> + struct Q_QML_EXPORT As : Method<Throws::No> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT In : Method<Throws::Yes> + struct Q_QML_EXPORT In : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Add : Method<Throws::Yes> + struct Q_QML_EXPORT Add : Method<Throws::Yes> { static ReturnedValue call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Sub : Method<Throws::Yes> + struct Q_QML_EXPORT Sub : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Mul : Method<Throws::Yes> + struct Q_QML_EXPORT Mul : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Div : Method<Throws::Yes> + struct Q_QML_EXPORT Div : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Mod : Method<Throws::Yes> + struct Q_QML_EXPORT Mod : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Exp : Method<Throws::Yes> + struct Q_QML_EXPORT Exp : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT BitAnd : Method<Throws::Yes> + struct Q_QML_EXPORT BitAnd : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT BitOr : Method<Throws::Yes> + struct Q_QML_EXPORT BitOr : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT BitXor : Method<Throws::Yes> + struct Q_QML_EXPORT BitXor : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Shl : Method<Throws::Yes> + struct Q_QML_EXPORT Shl : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Shr : Method<Throws::Yes> + struct Q_QML_EXPORT Shr : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT UShr : Method<Throws::Yes> + struct Q_QML_EXPORT UShr : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT GreaterThan : Method<Throws::Yes> + struct Q_QML_EXPORT GreaterThan : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT LessThan : Method<Throws::Yes> + struct Q_QML_EXPORT LessThan : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT GreaterEqual : Method<Throws::Yes> + struct Q_QML_EXPORT GreaterEqual : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT LessEqual : Method<Throws::Yes> + struct Q_QML_EXPORT LessEqual : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT Equal : Method<Throws::Yes> + struct Q_QML_EXPORT Equal : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT NotEqual : Method<Throws::Yes> + struct Q_QML_EXPORT NotEqual : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT StrictEqual : Method<Throws::Yes> + struct Q_QML_EXPORT StrictEqual : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT StrictNotEqual : Method<Throws::Yes> + struct Q_QML_EXPORT StrictNotEqual : Method<Throws::Yes> { static ReturnedValue call(const Value &, const Value &); }; /* comparisons */ - struct Q_QML_PRIVATE_EXPORT CompareGreaterThan : Method<Throws::Yes> + struct Q_QML_EXPORT CompareGreaterThan : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareLessThan : Method<Throws::Yes> + struct Q_QML_EXPORT CompareLessThan : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareGreaterEqual : Method<Throws::Yes> + struct Q_QML_EXPORT CompareGreaterEqual : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareLessEqual : Method<Throws::Yes> + struct Q_QML_EXPORT CompareLessEqual : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareEqual : Method<Throws::Yes> + struct Q_QML_EXPORT CompareEqual : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareNotEqual : Method<Throws::Yes> + struct Q_QML_EXPORT CompareNotEqual : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareStrictEqual : Method<Throws::Yes> + struct Q_QML_EXPORT CompareStrictEqual : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareStrictNotEqual : Method<Throws::Yes> + struct Q_QML_EXPORT CompareStrictNotEqual : Method<Throws::Yes> { static Bool call(const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareInstanceof : Method<Throws::Yes> + struct Q_QML_EXPORT CompareInstanceof : Method<Throws::Yes> { static Bool call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT CompareIn : Method<Throws::Yes> + struct Q_QML_EXPORT CompareIn : Method<Throws::Yes> { static Bool call(ExecutionEngine *, const Value &, const Value &); }; - struct Q_QML_PRIVATE_EXPORT RegexpLiteral : PureMethod + struct Q_QML_EXPORT RegexpLiteral : PureMethod { static ReturnedValue call(ExecutionEngine *, int); }; - struct Q_QML_PRIVATE_EXPORT GetTemplateObject : PureMethod + struct Q_QML_EXPORT GetTemplateObject : PureMethod { static ReturnedValue call(Function *, int); }; diff --git a/src/qml/jsruntime/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h index 2ea20b0466..3d1baf6c77 100644 --- a/src/qml/jsruntime/qv4sequenceobject_p.h +++ b/src/qml/jsruntime/qv4sequenceobject_p.h @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { struct Sequence; -struct Q_QML_PRIVATE_EXPORT SequencePrototype : public QV4::Object +struct Q_QML_EXPORT SequencePrototype : public QV4::Object { V4_PROTOTYPE(arrayPrototype) void init(); @@ -83,7 +83,7 @@ private: } -struct Q_QML_PRIVATE_EXPORT Sequence : public QV4::ReferenceObject +struct Q_QML_EXPORT Sequence : public QV4::ReferenceObject { V4_OBJECT2(Sequence, QV4::ReferenceObject) Q_MANAGED_TYPE(V4Sequence) diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h index 449d4f095d..2882e6eee8 100644 --- a/src/qml/jsruntime/qv4stackframe_p.h +++ b/src/qml/jsruntime/qv4stackframe_p.h @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { struct CppStackFrame; -struct Q_QML_PRIVATE_EXPORT CppStackFrameBase +struct Q_QML_EXPORT CppStackFrameBase { enum class Kind : quint8 { JS, Meta }; @@ -62,7 +62,7 @@ struct Q_QML_PRIVATE_EXPORT CppStackFrameBase Kind kind; }; -struct Q_QML_PRIVATE_EXPORT CppStackFrame : protected CppStackFrameBase +struct Q_QML_EXPORT CppStackFrame : protected CppStackFrameBase { // We want to have those public but we can't declare them as public without making the struct // non-standard layout. So we have this other struct with "using" in between. @@ -119,7 +119,7 @@ protected: } }; -struct Q_QML_PRIVATE_EXPORT MetaTypesStackFrame : public CppStackFrame +struct Q_QML_EXPORT MetaTypesStackFrame : public CppStackFrame { using CppStackFrame::push; using CppStackFrame::pop; @@ -158,7 +158,7 @@ struct Q_QML_PRIVATE_EXPORT MetaTypesStackFrame : public CppStackFrame } }; -struct Q_QML_PRIVATE_EXPORT JSTypesStackFrame : public CppStackFrame +struct Q_QML_EXPORT JSTypesStackFrame : public CppStackFrame { using CppStackFrame::jsFrame; diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 0b0d8fb528..370baadc98 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -29,7 +29,7 @@ struct PropertyKey; namespace Heap { -struct Q_QML_PRIVATE_EXPORT StringOrSymbol : Base +struct Q_QML_EXPORT StringOrSymbol : Base { enum StringType { StringType_Symbol, @@ -76,7 +76,7 @@ struct Q_QML_PRIVATE_EXPORT StringOrSymbol : Base } }; -struct Q_QML_PRIVATE_EXPORT String : StringOrSymbol { +struct Q_QML_EXPORT String : StringOrSymbol { static void markObjects(Heap::Base *that, MarkStack *markStack); const VTable *vtable() const { @@ -136,7 +136,7 @@ int String::length() const { } -struct Q_QML_PRIVATE_EXPORT StringOrSymbol : public Managed { +struct Q_QML_EXPORT StringOrSymbol : public Managed { V4_MANAGED(StringOrSymbol, Managed) V4_NEEDS_DESTROY enum { @@ -155,7 +155,7 @@ public: } }; -struct Q_QML_PRIVATE_EXPORT String : public StringOrSymbol { +struct Q_QML_EXPORT String : public StringOrSymbol { V4_MANAGED(String, StringOrSymbol) Q_MANAGED_TYPE(String) V4_INTERNALCLASS(String) diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h index 0284dceb7b..9747eac411 100644 --- a/src/qml/jsruntime/qv4typedarray_p.h +++ b/src/qml/jsruntime/qv4typedarray_p.h @@ -106,7 +106,7 @@ struct TypedArrayPrototype : Object { } -struct Q_QML_PRIVATE_EXPORT TypedArray : Object +struct Q_QML_EXPORT TypedArray : Object { V4_OBJECT2(TypedArray, Object) diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index dceb95d0c1..f2d01c56cd 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -34,7 +34,7 @@ namespace Heap { struct Base; } -struct Q_QML_PRIVATE_EXPORT Value : public StaticValue +struct Q_QML_EXPORT Value : public StaticValue { using ManagedPtr = Managed *; diff --git a/src/qml/jsruntime/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h index c5fbcfa070..f2394ce9a2 100644 --- a/src/qml/jsruntime/qv4variantobject_p.h +++ b/src/qml/jsruntime/qv4variantobject_p.h @@ -54,7 +54,7 @@ private: } -struct Q_QML_PRIVATE_EXPORT VariantObject : Object +struct Q_QML_EXPORT VariantObject : Object { V4_OBJECT2(VariantObject, Object) V4_PROTOTYPE(variantPrototype) diff --git a/src/qml/jsruntime/qv4vtable_p.h b/src/qml/jsruntime/qv4vtable_p.h index 7db1e71704..8ec8c87a31 100644 --- a/src/qml/jsruntime/qv4vtable_p.h +++ b/src/qml/jsruntime/qv4vtable_p.h @@ -24,7 +24,7 @@ namespace QV4 { struct Lookup; -struct Q_QML_PRIVATE_EXPORT OwnPropertyKeyIterator { +struct Q_QML_EXPORT OwnPropertyKeyIterator { virtual ~OwnPropertyKeyIterator() = 0; virtual PropertyKey next(const Object *o, Property *p = nullptr, PropertyAttributes *attrs = nullptr) = 0; }; diff --git a/src/qml/memory/qv4mmdefs_p.h b/src/qml/memory/qv4mmdefs_p.h index 277b1adcc5..b77b615e6c 100644 --- a/src/qml/memory/qv4mmdefs_p.h +++ b/src/qml/memory/qv4mmdefs_p.h @@ -229,7 +229,7 @@ Q_STATIC_ASSERT(sizeof(HeapItem) == Chunk::SlotSize); Q_STATIC_ASSERT(QT_POINTER_SIZE*8 == Chunk::Bits); Q_STATIC_ASSERT((1 << Chunk::BitShift) == Chunk::Bits); -struct Q_QML_PRIVATE_EXPORT MarkStack { +struct Q_QML_EXPORT MarkStack { MarkStack(ExecutionEngine *engine); ~MarkStack() { /* we drain manually */ } diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h index 4de5524a10..78ce738f3b 100644 --- a/src/qml/qml/ftw/qhashedstring_p.h +++ b/src/qml/qml/ftw/qhashedstring_p.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE class QHashedStringRef; -class Q_QML_PRIVATE_EXPORT QHashedString : public QString +class Q_QML_EXPORT QHashedString : public QString { public: inline QHashedString(); @@ -56,7 +56,7 @@ private: }; class QHashedCStringRef; -class Q_QML_PRIVATE_EXPORT QHashedStringRef +class Q_QML_EXPORT QHashedStringRef { public: inline QHashedStringRef(); diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h index d4c00ea886..8230c6aa6b 100644 --- a/src/qml/qml/qqmlabstractbinding_p.h +++ b/src/qml/qml/qqmlabstractbinding_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE class QQmlObjectCreator; class QQmlAnyBinding; -class Q_QML_PRIVATE_EXPORT QQmlAbstractBinding +class Q_QML_EXPORT QQmlAbstractBinding { friend class QQmlAnyBinding; protected: diff --git a/src/qml/qml/qqmlapplicationengine_p.h b/src/qml/qml/qqmlapplicationengine_p.h index 4cf21bba6d..df99783e0a 100644 --- a/src/qml/qml/qqmlapplicationengine_p.h +++ b/src/qml/qml/qqmlapplicationengine_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE class QFileSelector; -class Q_QML_PRIVATE_EXPORT QQmlApplicationEnginePrivate : public QQmlEnginePrivate +class Q_QML_EXPORT QQmlApplicationEnginePrivate : public QQmlEnginePrivate { Q_DECLARE_PUBLIC(QQmlApplicationEngine) public: diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h index 00aa0d6f58..4031a2655e 100644 --- a/src/qml/qml/qqmlbinding_p.h +++ b/src/qml/qml/qqmlbinding_p.h @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE class QQmlContext; -class Q_QML_PRIVATE_EXPORT QQmlBinding : public QQmlJavaScriptExpression, +class Q_QML_EXPORT QQmlBinding : public QQmlJavaScriptExpression, public QQmlAbstractBinding { friend class QQmlAbstractBinding; diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index ebb6c7e532..9eab562f56 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlBoundSignalExpression final +class Q_QML_EXPORT QQmlBoundSignalExpression final : public QQmlJavaScriptExpression, public QQmlRefCounted<QQmlBoundSignalExpression> { @@ -62,7 +62,7 @@ private: const QObject *m_target; }; -class Q_QML_PRIVATE_EXPORT QQmlBoundSignal : public QQmlNotifierEndpoint +class Q_QML_EXPORT QQmlBoundSignal : public QQmlNotifierEndpoint { public: QQmlBoundSignal(QObject *target, int signal, QObject *owner, QQmlEngine *engine); diff --git a/src/qml/qml/qqmlbuiltinfunctions_p.h b/src/qml/qml/qqmlbuiltinfunctions_p.h index 3b1a630e1a..5a49db62aa 100644 --- a/src/qml/qml/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/qqmlbuiltinfunctions_p.h @@ -226,7 +226,7 @@ struct ConsoleObject : Object }; -struct Q_QML_PRIVATE_EXPORT GlobalExtensions { +struct Q_QML_EXPORT GlobalExtensions { static void init(Object *globalObject, QJSEngine::Extensions extensions); #if QT_CONFIG(translation) diff --git a/src/qml/qml/qqmlcomponent_p.h b/src/qml/qml/qqmlcomponent_p.h index 1d3f1d03aa..4d01d458a7 100644 --- a/src/qml/qml/qqmlcomponent_p.h +++ b/src/qml/qml/qqmlcomponent_p.h @@ -36,7 +36,7 @@ class QQmlComponent; class QQmlEngine; class QQmlComponentAttached; -class Q_QML_PRIVATE_EXPORT QQmlComponentPrivate : public QObjectPrivate, public QQmlTypeData::TypeDataCallback +class Q_QML_EXPORT QQmlComponentPrivate : public QObjectPrivate, public QQmlTypeData::TypeDataCallback { Q_DECLARE_PUBLIC(QQmlComponent) diff --git a/src/qml/qml/qqmlcomponentattached_p.h b/src/qml/qml/qqmlcomponentattached_p.h index a25222e766..303fea7b46 100644 --- a/src/qml/qml/qqmlcomponentattached_p.h +++ b/src/qml/qml/qqmlcomponentattached_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE // implemented in qqmlcomponent.cpp -class Q_QML_PRIVATE_EXPORT QQmlComponentAttached : public QObject +class Q_QML_EXPORT QQmlComponentAttached : public QObject { Q_OBJECT public: diff --git a/src/qml/qml/qqmlcontextdata_p.h b/src/qml/qml/qqmlcontextdata_p.h index a0202eb1ba..71dda623b9 100644 --- a/src/qml/qml/qqmlcontextdata_p.h +++ b/src/qml/qml/qqmlcontextdata_p.h @@ -30,7 +30,7 @@ class QQmlGuardedContextData; class QQmlJavaScriptExpression; class QQmlIncubatorPrivate; -class Q_QML_PRIVATE_EXPORT QQmlContextData +class Q_QML_EXPORT QQmlContextData { public: static QQmlRefPointer<QQmlContextData> createRefCounted( diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h index 967caf39c0..4a3628fdb1 100644 --- a/src/qml/qml/qqmlcustomparser_p.h +++ b/src/qml/qml/qqmlcustomparser_p.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE class QQmlPropertyValidator; class QQmlEnginePrivate; -class Q_QML_PRIVATE_EXPORT QQmlCustomParser +class Q_QML_EXPORT QQmlCustomParser { public: enum Flag { diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h index 38fedea9a3..7055ca94e6 100644 --- a/src/qml/qml/qqmldata_p.h +++ b/src/qml/qml/qqmldata_p.h @@ -52,7 +52,7 @@ struct Binding; // 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_PRIVATE_EXPORT QQmlData : public QAbstractDeclarativeData +class Q_QML_EXPORT QQmlData : public QAbstractDeclarativeData { public: enum Ownership { DoesNotOwnMemory, OwnsMemory }; diff --git a/src/qml/qml/qqmldatablob_p.h b/src/qml/qml/qqmldatablob_p.h index fe4b81db18..d8b7e69ea5 100644 --- a/src/qml/qml/qqmldatablob_p.h +++ b/src/qml/qml/qqmldatablob_p.h @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE class QQmlTypeLoader; -class Q_QML_PRIVATE_EXPORT QQmlDataBlob : public QQmlRefCounted<QQmlDataBlob> +class Q_QML_EXPORT QQmlDataBlob : public QQmlRefCounted<QQmlDataBlob> { public: using Ptr = QQmlRefPointer<QQmlDataBlob>; diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 2550808dd8..4b38db9ec9 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -97,7 +97,7 @@ struct TriggerList : QPropertyChangeTrigger { TriggerList *next = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlEnginePrivate : public QJSEnginePrivate +class Q_QML_EXPORT QQmlEnginePrivate : public QJSEnginePrivate { Q_DECLARE_PUBLIC(QQmlEngine) public: @@ -384,7 +384,7 @@ QQmlEnginePrivate *QQmlEnginePrivate::get(QV4::ExecutionEngine *e) } template<> -Q_QML_PRIVATE_EXPORT QJSValue QQmlEnginePrivate::singletonInstance<QJSValue>(const QQmlType &type); +Q_QML_EXPORT QJSValue QQmlEnginePrivate::singletonInstance<QJSValue>(const QQmlType &type); template<typename T> T QQmlEnginePrivate::singletonInstance(const QQmlType &type) { diff --git a/src/qml/qml/qqmlfileselector_p.h b/src/qml/qml/qqmlfileselector_p.h index ea1c1902bb..58696acef7 100644 --- a/src/qml/qml/qqmlfileselector_p.h +++ b/src/qml/qml/qqmlfileselector_p.h @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE class QFileSelector; class QQmlFileSelectorInterceptor; -class Q_QML_PRIVATE_EXPORT QQmlFileSelectorPrivate : public QObjectPrivate +class Q_QML_EXPORT QQmlFileSelectorPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQmlFileSelector) public: @@ -40,7 +40,7 @@ public: QScopedPointer<QQmlFileSelectorInterceptor> myInstance; }; -class Q_QML_PRIVATE_EXPORT QQmlFileSelectorInterceptor : public QQmlAbstractUrlInterceptor +class Q_QML_EXPORT QQmlFileSelectorInterceptor : public QQmlAbstractUrlInterceptor { public: QQmlFileSelectorInterceptor(QQmlFileSelectorPrivate* pd); diff --git a/src/qml/qml/qqmlfinalizer_p.h b/src/qml/qml/qqmlfinalizer_p.h index 57f5fdb61b..66fd85ddad 100644 --- a/src/qml/qml/qqmlfinalizer_p.h +++ b/src/qml/qml/qqmlfinalizer_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlFinalizerHook +class Q_QML_EXPORT QQmlFinalizerHook { public: virtual ~QQmlFinalizerHook(); diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index 904a1c1dcc..061a55a9e6 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -751,7 +751,7 @@ QVariant QQmlColorProvider::tint(const QVariant &, const QVariant &) { return QV static QQmlColorProvider *colorProvider = nullptr; -Q_QML_PRIVATE_EXPORT QQmlColorProvider *QQml_setColorProvider(QQmlColorProvider *newProvider) +Q_QML_EXPORT QQmlColorProvider *QQml_setColorProvider(QQmlColorProvider *newProvider) { QQmlColorProvider *old = colorProvider; colorProvider = newProvider; @@ -805,7 +805,7 @@ QString QQmlGuiProvider::pluginName() const { return QString(); } static QQmlGuiProvider *guiProvider = nullptr; -Q_QML_PRIVATE_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *newProvider) +Q_QML_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *newProvider) { QQmlGuiProvider *old = guiProvider; guiProvider = newProvider; diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index b6dd2182d3..98fe2e6a79 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -123,8 +123,8 @@ do { \ QMetaObject::disconnect(sender, signalIdx, receiver, methodIdx); \ } while (0) -Q_QML_PRIVATE_EXPORT bool qmlobject_can_cpp_cast(QObject *object, const QMetaObject *mo); -Q_QML_PRIVATE_EXPORT bool qmlobject_can_qml_cast(QObject *object, const QQmlType &type); +Q_QML_EXPORT bool qmlobject_can_cpp_cast(QObject *object, const QMetaObject *mo); +Q_QML_EXPORT bool qmlobject_can_qml_cast(QObject *object, const QQmlType &type); /*! This method is identical to qobject_cast<T>() except that it does not require lazy @@ -211,7 +211,7 @@ public: static bool populateValueType( QMetaType targetMetaType, void *target, QMetaType sourceMetaType, void *source); - static Q_QML_PRIVATE_EXPORT void *heapCreateValueType( + static Q_QML_EXPORT void *heapCreateValueType( const QQmlType &targetType, const QV4::Value &source); static QVariant constructValueType( QMetaType targetMetaType, const QMetaObject *targetMetaObject, @@ -223,7 +223,7 @@ public: static QVariant createValueType(const QVariant &, QMetaType); }; -class Q_QML_PRIVATE_EXPORT QQmlColorProvider +class Q_QML_EXPORT QQmlColorProvider { public: virtual ~QQmlColorProvider(); @@ -239,11 +239,11 @@ public: virtual QVariant tint(const QVariant &, const QVariant &); }; -Q_QML_PRIVATE_EXPORT QQmlColorProvider *QQml_setColorProvider(QQmlColorProvider *); -Q_QML_PRIVATE_EXPORT QQmlColorProvider *QQml_colorProvider(); +Q_QML_EXPORT QQmlColorProvider *QQml_setColorProvider(QQmlColorProvider *); +Q_QML_EXPORT QQmlColorProvider *QQml_colorProvider(); class QQmlApplication; -class Q_QML_PRIVATE_EXPORT QQmlGuiProvider +class Q_QML_EXPORT QQmlGuiProvider { public: virtual ~QQmlGuiProvider(); @@ -255,12 +255,12 @@ public: virtual QString pluginName() const; }; -Q_QML_PRIVATE_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *); +Q_QML_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *); Q_AUTOTEST_EXPORT QQmlGuiProvider *QQml_guiProvider(); class QQmlApplicationPrivate; -class Q_QML_PRIVATE_EXPORT QQmlApplication : public QObject +class Q_QML_EXPORT QQmlApplication : public QObject { //Application level logic, subclassed by Qt Quick if available via QQmlGuiProvider Q_OBJECT diff --git a/src/qml/qml/qqmlguard_p.h b/src/qml/qml/qqmlguard_p.h index 30241330b8..685293868e 100644 --- a/src/qml/qml/qqmlguard_p.h +++ b/src/qml/qml/qqmlguard_p.h @@ -74,7 +74,7 @@ public: * We save it in objectDestroyFn to save space * (implemented in qqmlengine.cpp) */ -void Q_QML_PRIVATE_EXPORT hasJsOwnershipIndicator(QQmlGuardImpl *); +void Q_QML_EXPORT hasJsOwnershipIndicator(QQmlGuardImpl *); template <typename T> class QQmlStrongJSQObjectReference final : protected QQmlGuardImpl diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index 4466c1c324..15e3a95ad2 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -115,7 +115,7 @@ public: } }; -class Q_QML_PRIVATE_EXPORT QQmlImports final : public QQmlRefCounted<QQmlImports> +class Q_QML_EXPORT QQmlImports final : public QQmlRefCounted<QQmlImports> { Q_DISABLE_COPY_MOVE(QQmlImports) public: @@ -262,7 +262,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlImports::ImportFlags) -class Q_QML_PRIVATE_EXPORT QQmlImportDatabase +class Q_QML_EXPORT QQmlImportDatabase { Q_DECLARE_TR_FUNCTIONS(QQmlImportDatabase) public: diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h index eec0f7f421..f35679a8a1 100644 --- a/src/qml/qml/qqmlincubator_p.h +++ b/src/qml/qml/qqmlincubator_p.h @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE class RequiredProperties; class QQmlIncubator; -class Q_QML_PRIVATE_EXPORT QQmlIncubatorPrivate : public QQmlEnginePrivate::Incubator, public QSharedData +class Q_QML_EXPORT QQmlIncubatorPrivate : public QQmlEnginePrivate::Incubator, public QSharedData { public: QQmlIncubatorPrivate(QQmlIncubator *q, QQmlIncubator::IncubationMode m); diff --git a/src/qml/qml/qqmlirloader_p.h b/src/qml/qml/qqmlirloader_p.h index f4c1213223..8a14d6833e 100644 --- a/src/qml/qml/qqmlirloader_p.h +++ b/src/qml/qml/qqmlirloader_p.h @@ -26,7 +26,7 @@ struct Document; struct Object; } -struct Q_QML_PRIVATE_EXPORT QQmlIRLoader { +struct Q_QML_EXPORT QQmlIRLoader { QQmlIRLoader(const QV4::CompiledData::Unit *unit, QmlIR::Document *output); void load(); diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index 3a56cbe423..80e2033627 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -62,7 +62,7 @@ private: QQmlDelayedError **prevError; }; -class Q_QML_PRIVATE_EXPORT QQmlJavaScriptExpression +class Q_QML_EXPORT QQmlJavaScriptExpression { Q_DISABLE_COPY_MOVE(QQmlJavaScriptExpression) public: @@ -185,7 +185,7 @@ protected: TriggerList *qpropertyChangeTriggers = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlPropertyCapture +class Q_QML_EXPORT QQmlPropertyCapture { public: QQmlPropertyCapture(QQmlEngine *engine, QQmlJavaScriptExpression *e, QQmlJavaScriptExpression::DeleteWatcher *w) diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index ff8eb65292..b3700ef558 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -57,7 +57,7 @@ private: namespace QQmlLocale { - Q_NAMESPACE_EXPORT(Q_QML_PRIVATE_EXPORT) + Q_NAMESPACE_EXPORT(Q_QML_EXPORT) QML_NAMED_ELEMENT(Locale) QML_ADDED_IN_VERSION(2, 2) QML_NAMESPACE_EXTENDED(QLocale) @@ -74,10 +74,10 @@ namespace QQmlLocale }; Q_ENUM_NS(DayOfWeek) - Q_QML_PRIVATE_EXPORT QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName); - Q_QML_PRIVATE_EXPORT QV4::ReturnedValue wrap(QV4::ExecutionEngine *engine, const QLocale &locale); - Q_QML_PRIVATE_EXPORT void registerStringLocaleCompare(QV4::ExecutionEngine *engine); - Q_QML_PRIVATE_EXPORT QV4::ReturnedValue method_localeCompare(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); + Q_QML_EXPORT QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName); + Q_QML_EXPORT QV4::ReturnedValue wrap(QV4::ExecutionEngine *engine, const QLocale &locale); + Q_QML_EXPORT void registerStringLocaleCompare(QV4::ExecutionEngine *engine); + Q_QML_EXPORT QV4::ReturnedValue method_localeCompare(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); }; namespace QV4 { diff --git a/src/qml/qml/qqmlmetamoduleregistration.cpp b/src/qml/qml/qqmlmetamoduleregistration.cpp index 280c7a7c8d..8e55b62b3a 100644 --- a/src/qml/qml/qqmlmetamoduleregistration.cpp +++ b/src/qml/qml/qqmlmetamoduleregistration.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE // rely on the plugin to be loaded. // In CMakeLists.txt we've specified NO_GENERATE_QMLTYPES to prevent // the generation of an extra type registration file. -Q_QML_PRIVATE_EXPORT void qml_register_types_QtQml() +Q_QML_EXPORT void qml_register_types_QtQml() { // ### Qt7: Handle version 6 like version 2. qmlRegisterModule("QtQml", 2, 0); diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index ec6cfe8a6b..2eabcc2d92 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -30,7 +30,7 @@ class QQmlValueType; namespace QV4 { class ExecutableCompilationUnit; } -class Q_QML_PRIVATE_EXPORT QQmlMetaType +class Q_QML_EXPORT QQmlMetaType { friend class QQmlDesignerMetaObject; diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h index 844766a633..0ec7d5fef2 100644 --- a/src/qml/qml/qqmlnotifier_p.h +++ b/src/qml/qml/qqmlnotifier_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QQmlNotifierEndpoint; class QQmlData; -class Q_QML_PRIVATE_EXPORT QQmlNotifier +class Q_QML_EXPORT QQmlNotifier { public: inline QQmlNotifier(); diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 0e73feeac4..733cfef3f2 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -101,7 +101,7 @@ struct QQmlObjectCreatorSharedState final : QQmlRefCounted<QQmlObjectCreatorShar bool hadTopLevelRequiredProperties; }; -class Q_QML_PRIVATE_EXPORT QQmlObjectCreator +class Q_QML_EXPORT QQmlObjectCreator { Q_DECLARE_TR_FUNCTIONS(QQmlObjectCreator) public: diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h index 5dcb8e9a86..35e595ec15 100644 --- a/src/qml/qml/qqmlopenmetaobject_p.h +++ b/src/qml/qml/qqmlopenmetaobject_p.h @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE class QQmlEngine; class QMetaPropertyBuilder; class QQmlOpenMetaObjectTypePrivate; -class Q_QML_PRIVATE_EXPORT QQmlOpenMetaObjectType final +class Q_QML_EXPORT QQmlOpenMetaObjectType final : public QQmlRefCounted<QQmlOpenMetaObjectType> { public: @@ -54,7 +54,7 @@ private: }; class QQmlOpenMetaObjectPrivate; -class Q_QML_PRIVATE_EXPORT QQmlOpenMetaObject : public QAbstractDynamicMetaObject +class Q_QML_EXPORT QQmlOpenMetaObject : public QAbstractDynamicMetaObject { public: QQmlOpenMetaObject(QObject *, const QMetaObject * = nullptr); diff --git a/src/qml/qml/qqmlplatform_p.h b/src/qml/qml/qqmlplatform_p.h index 6595899f58..b8d2167fd5 100644 --- a/src/qml/qml/qqmlplatform_p.h +++ b/src/qml/qml/qqmlplatform_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlPlatform : public QObject +class Q_QML_EXPORT QQmlPlatform : public QObject { Q_OBJECT Q_PROPERTY(QString os READ os CONSTANT) diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index c9ed4606ea..fd07547d60 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -37,7 +37,7 @@ class QQmlMetaObject; class QQmlAbstractBinding; class QQmlBoundSignalExpression; -class Q_QML_PRIVATE_EXPORT QQmlPropertyPrivate final : public QQmlRefCounted<QQmlPropertyPrivate> +class Q_QML_EXPORT QQmlPropertyPrivate final : public QQmlRefCounted<QQmlPropertyPrivate> { public: enum class InitFlag { diff --git a/src/qml/qml/qqmlpropertybinding_p.h b/src/qml/qml/qqmlpropertybinding_p.h index edf11bc221..840239285e 100644 --- a/src/qml/qml/qqmlpropertybinding_p.h +++ b/src/qml/qml/qqmlpropertybinding_p.h @@ -33,7 +33,7 @@ namespace QV4 { class QQmlPropertyBinding; class QQmlScriptString; -class Q_QML_PRIVATE_EXPORT QQmlPropertyBindingJS : public QQmlJavaScriptExpression +class Q_QML_EXPORT QQmlPropertyBindingJS : public QQmlJavaScriptExpression { bool mustCaptureBindableProperty() const final {return false;} @@ -47,14 +47,14 @@ class Q_QML_PRIVATE_EXPORT QQmlPropertyBindingJS : public QQmlJavaScriptExpressi inline QQmlPropertyBinding const *asBinding() const; }; -class Q_QML_PRIVATE_EXPORT QQmlPropertyBindingJSForBoundFunction : public QQmlPropertyBindingJS +class Q_QML_EXPORT QQmlPropertyBindingJSForBoundFunction : public QQmlPropertyBindingJS { public: QV4::ReturnedValue evaluate(bool *isUndefined); QV4::PersistentValue m_boundFunction; }; -class Q_QML_PRIVATE_EXPORT QQmlPropertyBinding : public QPropertyBindingPrivate +class Q_QML_EXPORT QQmlPropertyBinding : public QPropertyBindingPrivate { friend class QQmlPropertyBindingJS; @@ -220,10 +220,10 @@ inline const QtPrivate::BindingFunctionVTable *bindingFunctionVTableForQQmlPrope class QQmlTranslationPropertyBinding { public: - static QUntypedPropertyBinding Q_QML_PRIVATE_EXPORT create(const QQmlPropertyData *pd, + static QUntypedPropertyBinding Q_QML_EXPORT create(const QQmlPropertyData *pd, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QV4::CompiledData::Binding *binding); - static QUntypedPropertyBinding Q_QML_PRIVATE_EXPORT + static QUntypedPropertyBinding Q_QML_EXPORT create(const QMetaType &pd, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QQmlTranslation &translationData); diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index a06a1b6e39..7ff499460d 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -116,7 +116,7 @@ private: mutable QBasicAtomicInteger<quintptr> d = 0; }; -class Q_QML_PRIVATE_EXPORT QQmlPropertyCache final +class Q_QML_EXPORT QQmlPropertyCache final : public QQmlRefCounted<QQmlPropertyCache> { public: diff --git a/src/qml/qml/qqmlpropertytopropertybinding_p.h b/src/qml/qml/qqmlpropertytopropertybinding_p.h index de6012ded9..d741c5a740 100644 --- a/src/qml/qml/qqmlpropertytopropertybinding_p.h +++ b/src/qml/qml/qqmlpropertytopropertybinding_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlPropertyToPropertyBinding +class Q_QML_EXPORT QQmlPropertyToPropertyBinding : public QQmlAbstractBinding, public QQmlNotifierEndpoint { public: diff --git a/src/qml/qml/qqmlpropertyvalueinterceptor_p.h b/src/qml/qml/qqmlpropertyvalueinterceptor_p.h index 90feabe565..9d1b0606cd 100644 --- a/src/qml/qml/qqmlpropertyvalueinterceptor_p.h +++ b/src/qml/qml/qqmlpropertyvalueinterceptor_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QQmlProperty; -class Q_QML_PRIVATE_EXPORT QQmlPropertyValueInterceptor +class Q_QML_EXPORT QQmlPropertyValueInterceptor { public: QQmlPropertyValueInterceptor(); diff --git a/src/qml/qml/qqmlproxymetaobject_p.h b/src/qml/qml/qqmlproxymetaobject_p.h index 66e24258e2..18cf2d4bac 100644 --- a/src/qml/qml/qqmlproxymetaobject_p.h +++ b/src/qml/qml/qqmlproxymetaobject_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlProxyMetaObject : public QDynamicMetaObjectData +class Q_QML_EXPORT QQmlProxyMetaObject : public QDynamicMetaObjectData { public: struct ProxyData { diff --git a/src/qml/qml/qqmlstringconverters_p.h b/src/qml/qml/qqmlstringconverters_p.h index 5a07b947ca..3a82a8ebca 100644 --- a/src/qml/qml/qqmlstringconverters_p.h +++ b/src/qml/qml/qqmlstringconverters_p.h @@ -30,19 +30,19 @@ class QByteArray; namespace QQmlStringConverters { - Q_QML_PRIVATE_EXPORT QVariant variantFromString(const QString &, QMetaType preferredType, bool *ok = nullptr); + Q_QML_EXPORT QVariant variantFromString(const QString &, QMetaType preferredType, bool *ok = nullptr); - Q_QML_PRIVATE_EXPORT QVariant colorFromString(const QString &, bool *ok = nullptr); - Q_QML_PRIVATE_EXPORT unsigned rgbaFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QVariant colorFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT unsigned rgbaFromString(const QString &, bool *ok = nullptr); #if QT_CONFIG(datestring) - Q_QML_PRIVATE_EXPORT QDate dateFromString(const QString &, bool *ok = nullptr); - Q_QML_PRIVATE_EXPORT QTime timeFromString(const QString &, bool *ok = nullptr); - Q_QML_PRIVATE_EXPORT QDateTime dateTimeFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QDate dateFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QTime timeFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QDateTime dateTimeFromString(const QString &, bool *ok = nullptr); #endif - Q_QML_PRIVATE_EXPORT QPointF pointFFromString(const QString &, bool *ok = nullptr); - Q_QML_PRIVATE_EXPORT QSizeF sizeFFromString(const QString &, bool *ok = nullptr); - Q_QML_PRIVATE_EXPORT QRectF rectFFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QPointF pointFFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QSizeF sizeFFromString(const QString &, bool *ok = nullptr); + Q_QML_EXPORT QRectF rectFFromString(const QString &, bool *ok = nullptr); } QT_END_NAMESPACE diff --git a/src/qml/qml/qqmltype_p.h b/src/qml/qml/qqmltype_p.h index 433d9b42a3..c4959cae06 100644 --- a/src/qml/qml/qqmltype_p.h +++ b/src/qml/qml/qqmltype_p.h @@ -40,7 +40,7 @@ namespace QV4 { struct String; } -class Q_QML_PRIVATE_EXPORT QQmlType +class Q_QML_EXPORT QQmlType { public: QQmlType(); @@ -119,7 +119,7 @@ public: bool isInlineComponentType() const; - struct Q_QML_PRIVATE_EXPORT SingletonInstanceInfo final + struct Q_QML_EXPORT SingletonInstanceInfo final : public QQmlRefCounted<SingletonInstanceInfo> { using Ptr = QQmlRefPointer<SingletonInstanceInfo>; diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index 7f0b593534..cd0c59fc21 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -38,14 +38,14 @@ class QQmlProfiler; class QQmlTypeLoaderThread; class QQmlEngine; -class Q_QML_PRIVATE_EXPORT QQmlTypeLoader +class Q_QML_EXPORT QQmlTypeLoader { Q_DECLARE_TR_FUNCTIONS(QQmlTypeLoader) public: using ChecksumCache = QHash<quintptr, QByteArray>; enum Mode { PreferSynchronous, Asynchronous, Synchronous }; - class Q_QML_PRIVATE_EXPORT Blob : public QQmlDataBlob + class Q_QML_EXPORT Blob : public QQmlDataBlob { public: Blob(const QUrl &url, QQmlDataBlob::Type type, QQmlTypeLoader *loader); diff --git a/src/qml/qml/qqmltypemodule_p.h b/src/qml/qml/qqmltypemodule_p.h index acf21de595..717b07ec60 100644 --- a/src/qml/qml/qqmltypemodule_p.h +++ b/src/qml/qml/qqmltypemodule_p.h @@ -94,7 +94,7 @@ public: void walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const; private: - static Q_QML_PRIVATE_EXPORT QQmlType findType( + static Q_QML_EXPORT QQmlType findType( const QList<QQmlTypePrivate *> *types, QTypeRevision version); const QString m_module; diff --git a/src/qml/qml/qqmltypenamecache_p.h b/src/qml/qml/qqmltypenamecache_p.h index 7563e3225a..1ec0a65fa0 100644 --- a/src/qml/qml/qqmltypenamecache_p.h +++ b/src/qml/qml/qqmltypenamecache_p.h @@ -45,7 +45,7 @@ struct QQmlImportRef { class QQmlType; class QQmlEngine; -class Q_QML_PRIVATE_EXPORT QQmlTypeNameCache final : public QQmlRefCounted<QQmlTypeNameCache> +class Q_QML_EXPORT QQmlTypeNameCache final : public QQmlRefCounted<QQmlTypeNameCache> { public: QQmlTypeNameCache(const QQmlRefPointer<QQmlImports> &imports) : m_imports(imports) {} diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h index a2071fa7fc..5329c3a746 100644 --- a/src/qml/qml/qqmlvaluetype_p.h +++ b/src/qml/qml/qqmlvaluetype_p.h @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlValueType : public QDynamicMetaObjectData +class Q_QML_EXPORT QQmlValueType : public QDynamicMetaObjectData { public: QQmlValueType() = default; @@ -60,7 +60,7 @@ private: QMetaObject *m_dynamicMetaObject = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlGadgetPtrWrapper : public QObject +class Q_QML_EXPORT QQmlGadgetPtrWrapper : public QObject { Q_OBJECT public: @@ -103,7 +103,7 @@ private: void *m_gadgetPtr = nullptr; }; -struct Q_QML_PRIVATE_EXPORT QQmlPointFValueType +struct Q_QML_EXPORT QQmlPointFValueType { QPointF v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -127,7 +127,7 @@ public: operator QPointF() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlPointValueType +struct Q_QML_EXPORT QQmlPointValueType { QPoint v; Q_PROPERTY(int x READ x WRITE setX FINAL) @@ -151,7 +151,7 @@ public: operator QPoint() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlSizeFValueType +struct Q_QML_EXPORT QQmlSizeFValueType { QSizeF v; Q_PROPERTY(qreal width READ width WRITE setWidth FINAL) @@ -175,7 +175,7 @@ public: operator QSizeF() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlSizeValueType +struct Q_QML_EXPORT QQmlSizeValueType { QSize v; Q_PROPERTY(int width READ width WRITE setWidth FINAL) @@ -199,7 +199,7 @@ public: operator QSize() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlRectFValueType +struct Q_QML_EXPORT QQmlRectFValueType { QRectF v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -239,7 +239,7 @@ public: operator QRectF() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlRectValueType +struct Q_QML_EXPORT QQmlRectValueType { QRect v; Q_PROPERTY(int x READ x WRITE setX FINAL) @@ -282,7 +282,7 @@ public: #if QT_CONFIG(easingcurve) namespace QQmlEasingEnums { -Q_NAMESPACE_EXPORT(Q_QML_PRIVATE_EXPORT) +Q_NAMESPACE_EXPORT(Q_QML_EXPORT) QML_NAMED_ELEMENT(Easing) QML_ADDED_IN_VERSION(2, 0) @@ -317,7 +317,7 @@ enum Type { Q_ENUM_NS(Type) }; -struct Q_QML_PRIVATE_EXPORT QQmlEasingValueType +struct Q_QML_EXPORT QQmlEasingValueType { QEasingCurve v; Q_GADGET diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h index b4aae29a93..b8dfc28050 100644 --- a/src/qml/qml/qqmlvme_p.h +++ b/src/qml/qml/qqmlvme_p.h @@ -48,7 +48,7 @@ private: std::atomic<bool> *runWhile = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlVME +class Q_QML_EXPORT QQmlVME { public: static void enableComponentComplete(); diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index cf91d74e4a..d37c20a41b 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -98,7 +98,7 @@ private: }; -class Q_QML_PRIVATE_EXPORT QQmlInterceptorMetaObject : public QDynamicMetaObjectData +class Q_QML_EXPORT QQmlInterceptorMetaObject : public QDynamicMetaObjectData { public: QQmlInterceptorMetaObject(QObject *obj, const QQmlPropertyCache::ConstPtr &cache); @@ -173,7 +173,7 @@ inline QQmlInterceptorMetaObject *QQmlInterceptorMetaObject::get(QObject *obj) } class QQmlVMEMetaObjectEndpoint; -class Q_QML_PRIVATE_EXPORT QQmlVMEMetaObject : public QQmlInterceptorMetaObject +class Q_QML_EXPORT QQmlVMEMetaObject : public QQmlInterceptorMetaObject { public: QQmlVMEMetaObject(QV4::ExecutionEngine *engine, QObject *obj, diff --git a/src/qml/qmltc/qqmltcobjectcreationhelper_p.h b/src/qml/qmltc/qqmltcobjectcreationhelper_p.h index ae4633ac43..fe0cdcfed2 100644 --- a/src/qml/qmltc/qqmltcobjectcreationhelper_p.h +++ b/src/qml/qmltc/qqmltcobjectcreationhelper_p.h @@ -118,7 +118,7 @@ struct QmltcTypeData } }; -Q_QML_PRIVATE_EXPORT void qmltcCreateDynamicMetaObject(QObject *object, const QmltcTypeData &data); +Q_QML_EXPORT void qmltcCreateDynamicMetaObject(QObject *object, const QmltcTypeData &data); QT_END_NAMESPACE diff --git a/src/qml/qmltc/supportlibrary/qqmlcppbinding_p.h b/src/qml/qmltc/supportlibrary/qqmlcppbinding_p.h index 0f2e6a4998..a1c60012bc 100644 --- a/src/qml/qmltc/supportlibrary/qqmlcppbinding_p.h +++ b/src/qml/qmltc/supportlibrary/qqmlcppbinding_p.h @@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE -struct Q_QML_PRIVATE_EXPORT QQmlCppBinding +struct Q_QML_EXPORT QQmlCppBinding { // TODO: this might instead be put into the QQmlEngine or QQmlAnyBinding? static QUntypedPropertyBinding diff --git a/src/qml/qmltc/supportlibrary/qqmlcpponassignment_p.h b/src/qml/qmltc/supportlibrary/qqmlcpponassignment_p.h index 9c854430dc..cd8014895f 100644 --- a/src/qml/qmltc/supportlibrary/qqmlcpponassignment_p.h +++ b/src/qml/qmltc/supportlibrary/qqmlcpponassignment_p.h @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE (unintentionally?). This API allows to avoid manual casts to base types as the C++ compiler would implicitly cast derived classes in this case. */ -struct Q_QML_PRIVATE_EXPORT QQmlCppOnAssignmentHelper +struct Q_QML_EXPORT QQmlCppOnAssignmentHelper { // TODO: in theory, this API might just accept QObject * and int that would // give the QMetaProperty. using the meta property, one could create diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index c29e09cbea..6c5c3967ed 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -18,7 +18,7 @@ #include <QtCore/private/qglobal_p.h> #include <QtQml/qtqmlglobal.h> #include <QtQml/private/qtqml-config_p.h> -#include <QtQml/private/qtqmlexports_p.h> +#include <QtQml/qtqmlexports.h> #define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT diff --git a/src/qml/types/qqmlbind_p.h b/src/qml/types/qqmlbind_p.h index ab805057b5..aaefbc0618 100644 --- a/src/qml/types/qqmlbind_p.h +++ b/src/qml/types/qqmlbind_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QQmlBindPrivate; -class Q_QML_PRIVATE_EXPORT QQmlBind : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus +class Q_QML_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 8615914735..e0100aa452 100644 --- a/src/qml/types/qqmlconnections_p.h +++ b/src/qml/types/qqmlconnections_p.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE class QQmlBoundSignal; class QQmlContext; class QQmlConnectionsPrivate; -class Q_QML_PRIVATE_EXPORT QQmlConnections : public QObject, public QQmlParserStatus +class Q_QML_EXPORT QQmlConnections : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQmlConnections) diff --git a/src/qml/types/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h index db6e3e1057..e75b8bbe9d 100644 --- a/src/qml/types/qqmltimer_p.h +++ b/src/qml/types/qqmltimer_p.h @@ -26,7 +26,7 @@ QT_REQUIRE_CONFIG(qml_animation); QT_BEGIN_NAMESPACE class QQmlTimerPrivate; -class Q_QML_PRIVATE_EXPORT QQmlTimer : public QObject, public QQmlParserStatus +class Q_QML_EXPORT QQmlTimer : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQmlTimer) |