From e3d9ebb97ca3aa08c9970cb7ef29118ee7dcd517 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 1 Mar 2023 11:37:31 +0100 Subject: [PATCH] Doc: move snippet for implicit translation context The 'sdi' example is a candidate for removal, so point at the spreadsheet example instead, which is not. Change-Id: I4405f2421db8be79898a38ca4f3fa1ea5fe0280b Reviewed-by: Axel Spoerl (cherry picked from commit 721b4a4b5a8b4e16d50690e0d9ca62725c3ddafb) Reviewed-by: Qt Cherry-pick Bot --- examples/widgets/itemviews/spreadsheet/spreadsheet.cpp | 2 ++ examples/widgets/mainwindows/sdi/mainwindow.cpp | 2 -- src/corelib/kernel/qobject.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp index d26ad7f49da..37a307b26e9 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp +++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp @@ -106,9 +106,11 @@ void SpreadSheet::createActions() secondSeparator->setSeparator(true); } +//! [implicit tr context] void SpreadSheet::setupMenuBar() { QMenu *fileMenu = menuBar()->addMenu(tr("&File")); +//! [implicit tr context] fileMenu->addAction(printAction); fileMenu->addAction(exitAction); diff --git a/examples/widgets/mainwindows/sdi/mainwindow.cpp b/examples/widgets/mainwindows/sdi/mainwindow.cpp index 23800c98c09..734a793035f 100644 --- a/examples/widgets/mainwindows/sdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/sdi/mainwindow.cpp @@ -124,11 +124,9 @@ void MainWindow::tile(const QMainWindow *previous) move(pos); } -//! [implicit tr context] void MainWindow::createActions() { QMenu *fileMenu = menuBar()->addMenu(tr("&File")); -//! [implicit tr context] QToolBar *fileToolBar = addToolBar(tr("File")); const QIcon newIcon = QIcon::fromTheme("document-new", QIcon(":/images/new.png")); diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 950736232df..f34ee9d5f5e 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2383,7 +2383,7 @@ void QObject::deleteLater() translated string is available. Example: - \snippet ../widgets/mainwindows/sdi/mainwindow.cpp implicit tr context + \snippet ../widgets/itemviews/spreadsheet/spreadsheet.cpp implicit tr context \dots If the same \a sourceText is used in different roles within the