diff options
author | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
commit | a59c7684897bfbbb7ddcec2f05263fee92ab5056 (patch) | |
tree | 50793671569f87bdbfc0e9ff36adbf416971d6cf /src/widgets/dialogs/qmessagebox.cpp | |
parent | 5507d0f1b04ea6b1d91be9ade30bc31d1830c220 (diff) | |
parent | 1c75f59588694557caba69c2fc173dd8f1d7f514 (diff) | |
download | qtbase-a59c7684897bfbbb7ddcec2f05263fee92ab5056.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/kernel/qobject.cpp
Change-Id: I4780b25665672692b086ee92092e506c814642f2
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 17d199cb4f..7a6223f45c 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. @@ -1890,7 +1890,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "<p>Qt and the Qt logo are trademarks of The Qt Company Ltd.</p>" "<p>Qt is The Qt Company Ltd product developed as an open source " "project. See <a href=\"http://%3/\">%3</a> for more information.</p>" - ).arg(QStringLiteral("2019"), + ).arg(QStringLiteral("2020"), QStringLiteral("qt.io/licensing"), QStringLiteral("qt.io")); QMessageBox *msgBox = new QMessageBox(parent); |