Add missing QT_TRID_N_NOOP definition

Amends c74bd2b, properly following up on qttools/bc47b5190. [ChangeLog][QtCore] Added missing QT_TRID_N_NOOP() macro. Lupdate actually recognizes it since Qt 5.12. Fixes: QTBUG-98277 Fixes: QTBUG-3945 Change-Id: I0ea15ceb49b2ead5c8bb40d2a55a0ae8577e8850 Reviewed-by: Oswald Buddenhagen <[email protected]> Reviewed-by: Kai Koehne <[email protected]>
fwcd · Nov 18, 2021 · fb33e2a · fb33e2a
1 parent 4515c5e
commit fb33e2a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -512,6 +512,20 @@ void TheClass::addLabels()
 }
 //! [qttrid_noop]
 
+//! [qttrid_n_noop]
+static const char * const ids[] = {
+    //% "%n foo(s) found."
+    QT_TRID_N_NOOP("qtn_foo"),
+    //% "%n bar(s) found."
+    QT_TRID_N_NOOP("qtn_bar"),
+    0
+};
+
+QString result(int type, int n)
+{
+    return qtTrId(ids[type], n);
+}
+//! [qttrid_n_noop]
 
 //! [37]
 qWarning("%s: %s", qUtf8Printable(key), qUtf8Printable(value));

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
@@ -4060,6 +4060,26 @@ bool qunsetenv(const char *varName)
     \sa qtTrId(), {Internationalization with Qt}
 */
 
+/*!
+    \macro QT_TRID_N_NOOP(id)
+    \relates <QtGlobal>
+    \since 6.3
+
+    \brief The QT_TRID_N_NOOP macro marks an id for numerator
+    dependent dynamic translation.
+
+    The only purpose of this macro is to provide an anchor for attaching
+    meta data like to qtTrId().
+
+    The macro expands to \a id.
+
+    Example:
+
+    \snippet code/src_corelib_global_qglobal.cpp qttrid_n_noop
+
+    \sa qtTrId(), {Internationalization with Qt}
+*/
+
 /*!
     \macro Q_LIKELY(expr)
     \relates <QtGlobal>

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
@@ -1358,6 +1358,7 @@ template <typename Ptr> inline auto qGetPtrHelper(Ptr &ptr) noexcept -> decltype
 Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1);
 
 #define QT_TRID_NOOP(id) id
+#define QT_TRID_N_NOOP(id) id
 
 #endif // QT_NO_TRANSLATION