diff options
Diffstat (limited to 'src/tools/moc/keywords.cpp')
-rw-r--r-- | src/tools/moc/keywords.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp index bb4f2883cb..75e643df79 100644 --- a/src/tools/moc/keywords.cpp +++ b/src/tools/moc/keywords.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -840,12 +840,12 @@ static const struct {CHARACTER, 0, 78, 393, CHARACTER}, {CHARACTER, 0, 85, 394, CHARACTER}, {CHARACTER, 0, 77, 395, CHARACTER}, - {CHARACTER, 0, 83, 396, CHARACTER}, + {Q_ENUM_TOKEN, 0, 83, 396, CHARACTER}, {Q_ENUMS_TOKEN, 0, 0, 0, CHARACTER}, {CHARACTER, 0, 76, 398, CHARACTER}, {CHARACTER, 0, 65, 399, CHARACTER}, {CHARACTER, 0, 71, 400, CHARACTER}, - {CHARACTER, 0, 83, 401, CHARACTER}, + {Q_FLAG_TOKEN, 0, 83, 401, CHARACTER}, {Q_FLAGS_TOKEN, 0, 0, 0, CHARACTER}, {CHARACTER, 0, 69, 403, CHARACTER}, {CHARACTER, 0, 67, 404, CHARACTER}, |