1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump copyright year to 2016

Browse Source 
Bump copyright year in tool output and user visible strings to 2016.

Task-number: QTBUG-50578
Change-Id: I2f4aa9089c6672726f554cba7e6009b425d27683
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
This commit is contained in:
Kai Koehne 2016-01-21 16:35:22 +01:00
parent 98dedefd0c
commit 7c797b4905
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE.LGPLv21
View File

@ -1,6 +1,6 @@
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. The Qt Toolkit is Copyright (C) 2016 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/ Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of You may use, distribute and copy the Qt GUI Toolkit under the terms of

2
LICENSE.LGPLv3
View File

@ -1,6 +1,6 @@
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. The Qt Toolkit is Copyright (C) 2016 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/ Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of You may use, distribute and copy the Qt GUI Toolkit under the terms of

2
doc/global/config.qdocconf
View File

@ -3,7 +3,7 @@
dita.metadata.default.author = Qt Project dita.metadata.default.author = Qt Project
dita.metadata.default.permissions = all dita.metadata.default.permissions = all
dita.metadata.default.publisher = Qt Project dita.metadata.default.publisher = Qt Project
dita.metadata.default.copyryear = 2015 dita.metadata.default.copyryear = 2016
dita.metadata.default.copyrholder = The Qt Company Ltd dita.metadata.default.copyrholder = The Qt Company Ltd
dita.metadata.default.audience = programmer dita.metadata.default.audience = programmer

2
doc/global/html-footer-online.qdocconf
View File

@ -78,7 +78,7 @@ HTML.footer += \
" <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \ " <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \
" <li id=\"menu-item-10375\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-10375\"><a href=\"mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20doc.qt.io%20site\">Feedback</a></li>\n" \ " <li id=\"menu-item-10375\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-10375\"><a href=\"mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20doc.qt.io%20site\">Feedback</a></li>\n" \
" <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \ " <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \
" <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2015 The Qt Company</a></li>\n" \ " <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2016 The Qt Company</a></li>\n" \
" </ul>\n" \ " </ul>\n" \
"</div>\n" \ "</div>\n" \
"</div>\n" \ "</div>\n" \

2
doc/global/html-footer.qdocconf
View File

@ -8,7 +8,7 @@ HTML.footer = \
"</div>\n" \ "</div>\n" \
"<div class=\"footer\">\n" \ "<div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2016 The Qt Company Ltd.\n" \
" Documentation contributions included herein are the copyrights of\n" \ " Documentation contributions included herein are the copyrights of\n" \
" their respective owners.<br>" \ " their respective owners.<br>" \
" The documentation provided herein is licensed under the terms of the" \ " The documentation provided herein is licensed under the terms of the" \

2
doc/global/qt-module-defaults-online.qdocconf
View File

@ -5,7 +5,7 @@
HTML.footer = \ HTML.footer = \
" </div>\n" \ " </div>\n" \
" <p class=\"copy-notice\">\n" \ " <p class=\"copy-notice\">\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2016 The Qt Company Ltd.\n" \
" Documentation contributions included herein are the copyrights of\n" \ " Documentation contributions included herein are the copyrights of\n" \
" their respective owners. " \ " their respective owners. " \
" The documentation provided herein is licensed under the terms of the" \ " The documentation provided herein is licensed under the terms of the" \

2
src/corelib/global/qlibraryinfo.cpp
View File

@ -647,7 +647,7 @@ extern "C" void qt_core_boilerplate();
void qt_core_boilerplate() void qt_core_boilerplate()
{ {
printf("This is the QtCore library version " QT_BUILD_STR "\n" printf("This is the QtCore library version " QT_BUILD_STR "\n"
"Copyright (C) 2015 The Qt Company Ltd.\n" "Copyright (C) 2016 The Qt Company Ltd.\n"
"Contact: http://www.qt.io/licensing/\n" "Contact: http://www.qt.io/licensing/\n"
"\n" "\n"
"Installation prefix: %s\n" "Installation prefix: %s\n"

4
src/corelib/kernel/qtcore_eval.cpp
View File

@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
static const char boilerplate_supported_but_time_limited[] = static const char boilerplate_supported_but_time_limited[] =
"\nQt %1 Evaluation License\n" "\nQt %1 Evaluation License\n"
"Copyright (C) 2015 The Qt Company Ltd.\n" "Copyright (C) 2016 The Qt Company Ltd.\n"
"This trial version may only be used for evaluation purposes\n" "This trial version may only be used for evaluation purposes\n"
"and will shut down after 120 minutes.\n" "and will shut down after 120 minutes.\n"
"Registered to:\n" "Registered to:\n"
@ -57,7 +57,7 @@ static const char boilerplate_supported_but_time_limited[] =
static const char boilerplate_supported[] = static const char boilerplate_supported[] =
"\nQt %1 Evaluation License\n" "\nQt %1 Evaluation License\n"
"Copyright (C) 2015 The Qt Company Ltd.\n" "Copyright (C) 2016 The Qt Company Ltd.\n"
"This trial version may only be used for evaluation purposes\n" "This trial version may only be used for evaluation purposes\n"
"Registered to:\n" "Registered to:\n"
" Licensee: %2\n\n" " Licensee: %2\n\n"

2
src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
View File

@ -67,7 +67,7 @@ static const char docTypeHeader[] =
#define PROGRAMNAME "qdbuscpp2xml" #define PROGRAMNAME "qdbuscpp2xml"
#define PROGRAMVERSION "0.2" #define PROGRAMVERSION "0.2"
#define PROGRAMCOPYRIGHT "Copyright (C) 2015 The Qt Company Ltd." #define PROGRAMCOPYRIGHT "Copyright (C) 2016 The Qt Company Ltd."
static QString outputFile; static QString outputFile;
static int flags; static int flags;

2
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
View File

@ -48,7 +48,7 @@
#define PROGRAMNAME "qdbusxml2cpp" #define PROGRAMNAME "qdbusxml2cpp"
#define PROGRAMVERSION "0.8" #define PROGRAMVERSION "0.8"
#define PROGRAMCOPYRIGHT "Copyright (C) 2015 The Qt Company Ltd." #define PROGRAMCOPYRIGHT "Copyright (C) 2016 The Qt Company Ltd."
#define ANNOTATION_NO_WAIT "org.freedesktop.DBus.Method.NoReply" #define ANNOTATION_NO_WAIT "org.freedesktop.DBus.Method.NoReply"

2
src/tools/qlalr/cppgenerator.cpp
View File

@ -47,7 +47,7 @@ QString CppGenerator::copyrightHeader() const
return QLatin1String( return QLatin1String(
"/****************************************************************************\n" "/****************************************************************************\n"
"**\n" "**\n"
"** Copyright (C) 2015 The Qt Company Ltd.\n" "** Copyright (C) 2016 The Qt Company Ltd.\n"
"** Contact: http://www.qt.io/licensing/\n" "** Contact: http://www.qt.io/licensing/\n"
"**\n" "**\n"
"** This file is part of the Qt Toolkit.\n" "** This file is part of the Qt Toolkit.\n"

2
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1903,7 +1903,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 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 " "<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>" "project. See <a href=\"http://%3/\">%3</a> for more information.</p>"
).arg(QStringLiteral("2015"), ).arg(QStringLiteral("2016"),
QStringLiteral("qt.io/licensing"), QStringLiteral("qt.io/licensing"),
QStringLiteral("qt.io")); QStringLiteral("qt.io"));
QMessageBox *msgBox = new QMessageBox(parent); QMessageBox *msgBox = new QMessageBox(parent);