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

Merge "Merge tag 'v5.3.0' into HEAD" into refs/staging/stable

Browse Source
This commit is contained in:
Sergio Ahumada 2014-06-11 12:10:04 +02:00 committed by The Qt Project
commit 4b43a5d528
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal ** Contact: http://www.qt-project.org/legal
** **
** This file is part of the QtCore module of the Qt Toolkit. ** This file is part of the QtCore module of the Qt Toolkit.
@ -55,7 +55,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) 2013 Digia Plc and/or its subsidiary(-ies).\n" "Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).\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"
@ -65,7 +65,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) 2013 Digia Plc and/or its subsidiary(-ies).\n" "Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).\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"