From 848b0544b171df35ad27093c46054c180bff775b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 31 May 2023 03:38:51 +0300 Subject: [PATCH] remove redundant QT_MOC guard in qvariant header mayhaps the MOC tool was choking on it at some point Signed-off-by: Ivailo Monev --- src/core/kernel/qvariant.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/kernel/qvariant.h b/src/core/kernel/qvariant.h index ea4014b6f..d8fa9d9e4 100644 --- a/src/core/kernel/qvariant.h +++ b/src/core/kernel/qvariant.h @@ -350,7 +350,6 @@ Q_CORE_EXPORT QDataStream& operator>> (QDataStream& s, QVariant::Type& p); Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant::Type p); #endif -#ifndef QT_MOC template inline T qvariant_cast(const QVariant &v) { const int vid = qMetaTypeId(); @@ -370,7 +369,6 @@ template<> inline QVariant qvariant_cast(const QVariant &v) return *reinterpret_cast(v.constData()); return v; } -#endif // QT_MOC #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant &);