diff options
| -rw-r--r-- | src/corelib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qttranslation.h (renamed from src/corelib/global/qtranslation.h) | 8 | ||||
| -rw-r--r-- | src/corelib/global/qttranslation.qdoc (renamed from src/corelib/global/qtranslation.qdoc) | 18 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index a4ea44db42..c5f460f931 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -81,8 +81,8 @@ qt_internal_add_module(Core global/qtdeprecationmarkers.h global/qtenvironmentvariables.cpp global/qtenvironmentvariables.h global/qtrace_p.h - global/qtranslation.h global/qtresource.h + global/qttranslation.h global/qtversionchecks.h global/qtypeinfo.h global/qtypes.cpp global/qtypes.h diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 70b0a0faf9..630ebf6b79 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -100,8 +100,8 @@ QT_END_NAMESPACE #include <QtCore/qswap.h> #include <QtCore/qtdeprecationmarkers.h> #include <QtCore/qtenvironmentvariables.h> -#include <QtCore/qtranslation.h> #include <QtCore/qtresource.h> +#include <QtCore/qttranslation.h> #include <QtCore/qtypetraits.h> #include <QtCore/qversiontagging.h> diff --git a/src/corelib/global/qtranslation.h b/src/corelib/global/qttranslation.h index 4c76d7d750..6e8405789e 100644 --- a/src/corelib/global/qtranslation.h +++ b/src/corelib/global/qttranslation.h @@ -1,13 +1,13 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef QTRANSLATION_H -#define QTRANSLATION_H +#ifndef QTTRANSLATION_H +#define QTTRANSLATION_H #include <QtCore/qglobal.h> #if 0 -#pragma qt_class(QTranslation) +#pragma qt_class(QtTranslation) #pragma qt_sync_stop_processing #endif @@ -38,4 +38,4 @@ QT_END_NAMESPACE #endif // QT_NO_TRANSLATION -#endif /* QTRANSLATION_H */ +#endif /* QTTRANSLATION_H */ diff --git a/src/corelib/global/qtranslation.qdoc b/src/corelib/global/qttranslation.qdoc index 5310e08bee..b2b0b1f3c3 100644 --- a/src/corelib/global/qtranslation.qdoc +++ b/src/corelib/global/qttranslation.qdoc @@ -3,7 +3,7 @@ /*! \macro QT_TR_NOOP(sourceText) - \relates <QTranslation> + \relates <QtTranslation> Marks the UTF-8 encoded string literal \a sourceText for delayed translation in the current context (class). @@ -23,7 +23,7 @@ /*! \macro QT_TRANSLATE_NOOP(context, sourceText) - \relates <QTranslation> + \relates <QtTranslation> Marks the UTF-8 encoded string literal \a sourceText for delayed translation in the given \a context. The \a context is typically @@ -41,7 +41,7 @@ /*! \macro QT_TRANSLATE_NOOP3(context, sourceText, disambiguation) - \relates <QTranslation> + \relates <QtTranslation> \since 4.4 Marks the UTF-8 encoded string literal \a sourceText for delayed @@ -63,7 +63,7 @@ /*! \macro QT_TR_N_NOOP(sourceText) - \relates <QTranslation> + \relates <QtTranslation> \since 5.12 Marks the UTF-8 encoded string literal \a sourceText for numerator @@ -83,7 +83,7 @@ /*! \macro QT_TRANSLATE_N_NOOP(context, sourceText) - \relates <QTranslation> + \relates <QtTranslation> \since 5.12 Marks the UTF-8 encoded string literal \a sourceText for numerator @@ -104,7 +104,7 @@ /*! \macro QT_TRANSLATE_N_NOOP3(context, sourceText, comment) - \relates <QTranslation> + \relates <QtTranslation> \since 5.12 Marks the UTF-8 encoded string literal \a sourceText for numerator @@ -128,7 +128,7 @@ /*! \fn QString qtTrId(const char *id, int n = -1) - \relates <QTranslation> + \relates <QtTranslation> \reentrant \since 4.6 @@ -168,7 +168,7 @@ /*! \macro QT_TRID_NOOP(id) - \relates <QTranslation> + \relates <QtTranslation> \since 4.6 \brief The QT_TRID_NOOP macro marks an id for dynamic translation. @@ -187,7 +187,7 @@ /*! \macro QT_TRID_N_NOOP(id) - \relates <QTranslation> + \relates <QtTranslation> \since 6.3 \brief The QT_TRID_N_NOOP macro marks an id for numerator |