summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2024-02-05 14:33:23 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-02-14 16:49:14 +0000
commit07c143ba017abe67005ed0857baca2b84608fee0 (patch)
treed8bf31a39bb20ba9c8e3d9656824798f5f5b2bbe
parent79c681a829d4db1a7d7415e134093f2f2f37757e (diff)
Remove year from generic Qt copyright information
Don't change any tr() strings though to not break translations. Task-number: QTBUG-121906 Change-Id: Iede7050c6850bf828cdfbcf90e6d597d86557d20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2f619974b4cb9527634ec9c9b60e3d47902ce76e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 99ca7e33f946b1e0d001b95c344d2d8286bb82b1)
-rw-r--r--src/assistant/assistant/mainwindow.cpp2
-rw-r--r--src/designer/src/designer/versiondialog.cpp2
-rw-r--r--src/distancefieldgenerator/mainwindow.cpp2
-rw-r--r--src/linguist/linguist/mainwindow.cpp4
-rw-r--r--src/qdbus/qdbusviewer/mainwindow.cpp2
5 files changed, 5 insertions, 7 deletions
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 281cd9889..5a8d846b2 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -855,7 +855,7 @@ void MainWindow::showAboutDialog()
"<p>Version %2</p>"
"<p>Browser: %3</p></center>"
"<p>Copyright (C) %4 The Qt Company Ltd.</p>")
- .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QStringLiteral("2023")),
+ .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QString()),
resources);
QLatin1String path(":/qt-project.org/assistant/images/assistant-128.png");
aboutDia.setPixmap(QString(path));
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index eacfe79fc..d2d0d32be 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -142,7 +142,7 @@ VersionDialog::VersionDialog(QWidget *parent)
lbl->setText(tr("%1"
"<br/>Copyright (C) %2 The Qt Company Ltd."
- ).arg(version, "2023"_L1));
+ ).arg(version, QString()));
lbl->setWordWrap(true);
lbl->setOpenExternalLinks(true);
diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp
index 3c4a0fb8b..d660a6d6b 100644
--- a/src/distancefieldgenerator/mainwindow.cpp
+++ b/src/distancefieldgenerator/mainwindow.cpp
@@ -746,7 +746,7 @@ void MainWindow::about()
"to prepare a font cache for Qt applications.</p>"
"<p>Copyright (C) %2 The Qt Company Ltd.</p>")
.arg(QLatin1String(QT_VERSION_STR))
- .arg(QLatin1String("2019")));
+ .arg(QString()));
msgBox->show();
}
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 71b4140ae..bc7f5dc69 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -1346,11 +1346,9 @@ void MainWindow::about()
const QString description
= tr("Qt Linguist is a tool for adding translations to Qt applications.");
- const QString copyright
- = tr("Copyright (C) %1 The Qt Company Ltd.").arg(QStringLiteral("2023"));
box.setText(QStringLiteral("<center><img src=\":/images/icons/linguist-128-32.png\"/></img><p>%1</p></center>"
"<p>%2</p>"
- "<p>%3</p>").arg(version, description, copyright));
+ "<p>Copyright (C) The Qt Company Ltd.</p>").arg(version, description));
box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist"));
box.setIcon(QMessageBox::NoIcon);
diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp
index b13b07ffa..ef75dbeb7 100644
--- a/src/qdbus/qdbusviewer/mainwindow.cpp
+++ b/src/qdbus/qdbusviewer/mainwindow.cpp
@@ -72,7 +72,7 @@ void MainWindow::about()
"<h3>%1</h3>"
"<p>Version %2</p></center>"
"<p>Copyright (C) %3 The Qt Company Ltd.</p>")
- .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), u"2023"_s));
+ .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QString()));
box.setWindowTitle(tr("D-Bus Viewer"));
box.exec();
}