diff options
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype_p.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 52e4477ca0..c34e442cdb 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -659,7 +659,7 @@ void QMetaType::destruct(void *data) const } } -void QtMetaTypePrivate::derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr) +void QtMetaTypePrivate::derefAndDestroy(NS(QtPrivate::QMetaTypeInterface) *d_ptr) { if (d_ptr && !d_ptr->ref.deref()) { if (auto reg = customTypeRegistry()) diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 00d57a7e68..e4e2aa9e43 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -193,12 +193,12 @@ template<> struct TypeDefinition<QIcon> { static const bool IsAvailable = false; #endif template<typename T> -static QtPrivate::QMetaTypeInterface *getInterfaceFromType() +static QT_PREPEND_NAMESPACE(QtPrivate::QMetaTypeInterface) *getInterfaceFromType() { if constexpr (std::is_same_v<T, void>) { return nullptr; } else if constexpr (QtMetaTypePrivate::TypeDefinition<T>::IsAvailable) { - return &QtPrivate::QMetaTypeForType<T>::metaType; + return &QT_PREPEND_NAMESPACE(QtPrivate::QMetaTypeForType)<T>::metaType; } return nullptr; } @@ -217,7 +217,7 @@ static QtPrivate::QMetaTypeInterface *getInterfaceFromType() QtMetaTypePrivate::QMetaTypeFunctionHelper<RealName, QtMetaTypePrivate::TypeDefinition<RealName>::IsAvailable>::Load(stream, data); \ return true; -void derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr); +void derefAndDestroy(QT_PREPEND_NAMESPACE(QtPrivate::QMetaTypeInterface) *d_ptr); } //namespace QtMetaTypePrivate |