From 4f56b7d841b9c882dfa12a8aa55c1ebe0f9ef0e0 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 14 Jul 2022 17:23:15 +0200 Subject: [PATCH] Fix build with the disabled 'translation' feature Definition of QMetaObject::metaType() should be outside the QT_NO_TRANSLATION guard. Fixes: QTBUG-104959 Pick-to: 6.2 6.3 6.4 Change-Id: Icb1bf6e9cbad8b4c70ca09b5e7eafd125d866557 Reviewed-by: Fabian Kosmale --- src/corelib/kernel/qmetaobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 0c51e644c4d..c73fd425c25 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -357,6 +357,7 @@ QString QMetaObject::tr(const char *s, const char *c, int n) const { return QCoreApplication::translate(objectClassName(this), s, c, n); } +#endif // QT_NO_TRANSLATION /*! \since 6.2 @@ -384,7 +385,6 @@ QMetaType QMetaObject::metaType() const return QMetaType::fromName(className()); // try lookup by name in that case } } -#endif // QT_NO_TRANSLATION /*! Returns the method offset for this class; i.e. the index position