diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-23 10:26:31 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-27 16:57:05 +0100 |
| commit | 865d3846d8d45bd8b9dde42f706ce40bb3c7468f (patch) | |
| tree | cd53b5d1095615a86eb9875ec2f371f3944ec9f1 | |
| parent | f3ce9e9332820a8b5084fb4d75994e8eb19ddfd3 (diff) | |
Revert "QMetaType: support manual unregistration"
This reverts commit cf000d080c61cde44bd84e53ee018f36e33b7257.
Reason for revert: This API is not needed (anymore) by qtdeclarative.
Change-Id: I8af604c2babe3afc11f183ddb3ce3a9038a456ad
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype_p.h | 1 |
3 files changed, 0 insertions, 17 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index ea0016c5af..52e4477ca0 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -669,13 +669,6 @@ void QtMetaTypePrivate::derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr) } } -Q_CORE_EXPORT void QtMetaTypePrivate::unsafeUnregister(QtPrivate::QMetaTypeInterface *d_ptr) -{ - if (auto reg = customTypeRegistry()) - reg->unregisterDynamicType(d_ptr->typeId.loadRelaxed()); - d_ptr->typeId = 0; -} - /*! \fn QMetaType::~QMetaType() @@ -1775,12 +1768,6 @@ QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(QT_METATYPE_DECLARE_TEMPLATE_ITER) QT_FOR_EACH_STATIC_CORE_CLASS(QT_METATYPE_DECLARE_TEMPLATE_ITER) QT_FOR_EACH_STATIC_CORE_POINTER(QT_METATYPE_DECLARE_TEMPLATE_ITER) QT_FOR_EACH_STATIC_CORE_TEMPLATE(QT_METATYPE_DECLARE_TEMPLATE_ITER) - -Q_CORE_EXPORT QMetaTypeInterface *QMetaTypeInterface::get(const QMetaType &metatype) -{ - return metatype.d_ptr; -} - #undef QT_METATYPE_DECLARE_TEMPLATE_ITER #endif } diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 2ae4ae1103..192d4616b1 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -700,7 +700,6 @@ public: static void unregisterConverterFunction(int from, int to); private: friend class QVariant; - friend class QtPrivate::QMetaTypeInterface; QtPrivate::QMetaTypeInterface *d_ptr = nullptr; }; @@ -2285,8 +2284,6 @@ public: using LegacyRegisterOp = void (*)(); LegacyRegisterOp legacyRegisterOp; - - Q_CORE_EXPORT static QMetaTypeInterface *get(const QMetaType &metatype); }; struct QTypeNormalizer diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 6bac442aea..00d57a7e68 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -218,7 +218,6 @@ static QtPrivate::QMetaTypeInterface *getInterfaceFromType() return true; void derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr); -Q_CORE_EXPORT void unsafeUnregister(QtPrivate::QMetaTypeInterface *d_ptr); } //namespace QtMetaTypePrivate |