From 51e138b6958bd5911a5c354c2bed25aae5c75759 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 24 Sep 2020 15:06:05 +0200 Subject: Remove traces of QObject::trUtf8 from documentation ... and from the duplicated Q_DECLARE_TR_FUNCTION macro for QXmlStream. We expect source code to be utf8 encoded in Qt 6, so the function is gone. Change-Id: Ie25329a54e709dc92a22893ad5ab023852300d81 Reviewed-by: Kai Koehne --- src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp | 2 -- src/corelib/doc/src/objectmodel/metaobjects.qdoc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/corelib/doc') diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp index 36b47e6f6e..9ef08f1c6b 100644 --- a/src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp @@ -126,8 +126,6 @@ private: //! [6] static inline QString tr(const char *sourceText, const char *comment = nullptr); -static inline QString trUtf8(const char *sourceText, - const char *comment = nullptr); //! [6] diff --git a/src/corelib/doc/src/objectmodel/metaobjects.qdoc b/src/corelib/doc/src/objectmodel/metaobjects.qdoc index 53b34fe120..ada6a6dea1 100644 --- a/src/corelib/doc/src/objectmodel/metaobjects.qdoc +++ b/src/corelib/doc/src/objectmodel/metaobjects.qdoc @@ -72,7 +72,7 @@ \li QObject::inherits() function returns whether an object is an instance of a class that inherits a specified class within the QObject inheritance tree. - \li QObject::tr() and QObject::trUtf8() translate strings for + \li QObject::tr() translates strings for \l{Internationalization with Qt}{internationalization}. \li QObject::setProperty() and QObject::property() dynamically set and get properties by name. -- cgit v1.2.3