diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 03:03:29 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 03:03:30 +0100 |
commit | 52ed979cbdcb197847d267d22ebbce189788a9ef (patch) | |
tree | 10bfdf703b5d9a626b56f980a43aedd63095c67a /src/qdbus | |
parent | d906d8765659528b93312778fcfb9033e2bf4315 (diff) | |
parent | e3507ac277fcb8da41ae21138b6c0f233d17ee38 (diff) | |
download | qttools-52ed979cbdcb197847d267d22ebbce189788a9ef.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie6dc6946f0cf21c2cf57643c393e61b2deefb90d
Diffstat (limited to 'src/qdbus')
-rw-r--r-- | src/qdbus/qdbusviewer/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp index ed0f882c9..37a2ef783 100644 --- a/src/qdbus/qdbusviewer/mainwindow.cpp +++ b/src/qdbus/qdbusviewer/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2020 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -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("2019"))); + .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2020"))); box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } |