diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-05 12:14:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-11 10:41:08 +0200 |
| commit | a16818cc3d1f9fadfcc6f89980a5f90ff1195159 (patch) | |
| tree | 3fdc813a8abee7ac84a0735f087732d54863d335 /src/corelib/kernel | |
| parent | 7df8b1ada4b23acedda5724b492c26a8e322648b (diff) | |
| parent | 4e9853139ca04858f1639e0fba6b8caf57474f29 (diff) | |
Merge tag 'v5.3.0' into HEAD
Qt 5.3.0 Release
Conflicts:
src/plugins/platforms/cocoa/qcocoaintegration.mm
Manually removed call to setWindow in src/plugins/platforms/cocoa/qcocoawindow.mm
to follow 1ac0f953ba70ceda76e90918ab4ae7ebe2339969.
Change-Id: Ieddedf4cd7b47effce6b6865fb9c48df6c5838a7
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qtcore_eval.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index 40c1157fb4..a5c4c36638 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -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 ** ** 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[] = "\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" "and will shut down after 120 minutes.\n" "Registered to:\n" @@ -65,7 +65,7 @@ static const char boilerplate_supported_but_time_limited[] = static const char boilerplate_supported[] = "\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" "Registered to:\n" " Licensee: %2\n\n" |