diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-07-14 17:23:15 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-07-15 14:44:55 +0200 |
| commit | 4f56b7d841b9c882dfa12a8aa55c1ebe0f9ef0e0 (patch) | |
| tree | 521f15238cca9ab43d858c01ea84878ea108dba1 /src/corelib/kernel/qmetaobject.cpp | |
| parent | 7d2361b9da5c1ee9ef0724917108d6a3294e14c2 (diff) | |
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 0c51e644c4..c73fd425c2 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 |