diff options
Diffstat (limited to 'src/qml/qml')
43 files changed, 87 insertions, 87 deletions
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, |