diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:15:02 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-05-08 08:15:02 +0300 |
commit | 3cb9142cafa3d5b39fd2020a79bfb4175721278e (patch) | |
tree | 9d16143a769cd9b2d9b7ed3b97e1380e5008d9bb | |
parent | e8c3c391de17edce4542819c79de3d27a57ff408 (diff) | |
parent | c9ca0b74892b4d5e0b9b974f2768826e819cfd08 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.14' into tqtc/lts-5.15-opensourcev5.15.14-lts-lgpl5.15
Change-Id: Ifae695579c5a48a313970229d616b1fa4d518095
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/assistant/assistant/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/designer/versiondialog.cpp | 2 | ||||
-rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/qdbus/qdbusviewer/mainwindow.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4a55f5212..210850612 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.13 +MODULE_VERSION = 5.15.14 diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index 5bb218b0e..1da864c0b 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -912,7 +912,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("2022")), + .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QStringLiteral("2023")), 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 215f6979d..a785315b9 100644 --- a/src/designer/src/designer/versiondialog.cpp +++ b/src/designer/src/designer/versiondialog.cpp @@ -160,7 +160,7 @@ VersionDialog::VersionDialog(QWidget *parent) lbl->setText(tr("%1" "<br/>Copyright (C) %2 The Qt Company Ltd." - ).arg(version, QStringLiteral("2022"))); + ).arg(version, QStringLiteral("2023"))); lbl->setWordWrap(true); lbl->setOpenExternalLinks(true); diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index ec6631f47..93a2530c5 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -1363,7 +1363,7 @@ 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("2022")); + = 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)); diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp index 35d06e5eb..8a96f6fbd 100644 --- a/src/qdbus/qdbusviewer/mainwindow.cpp +++ b/src/qdbus/qdbusviewer/mainwindow.cpp @@ -90,7 +90,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), QStringLiteral("2022"))); + .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2023"))); box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } |