diff options
Diffstat (limited to 'src/tools/moc/moc.cpp')
| -rw-r--r-- | src/tools/moc/moc.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 5506dc75c5..a9e33da01d 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.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$ @@ -139,6 +139,12 @@ bool Moc::parseClassHead(ClassDef *def) def->superclassList += qMakePair(type, access); } } while (test(COMMA)); + + if (knownGadgets.contains(def->superclassList.first().first)) { + // Q_GADGET subclasses are treated as Q_GADGETs + knownGadgets.insert(def->classname, def->qualified); + knownGadgets.insert(def->qualified, def->qualified); + } } if (!test(LBRACE)) return false; @@ -690,9 +696,11 @@ void Moc::parse() parsePluginData(&def); break; case Q_ENUMS_TOKEN: + case Q_ENUM_TOKEN: parseEnumOrFlag(&def, false); break; case Q_FLAGS_TOKEN: + case Q_FLAG_TOKEN: parseEnumOrFlag(&def, true); break; case Q_DECLARE_FLAGS_TOKEN: @@ -810,7 +818,7 @@ static void findRequiredContainers(ClassDef *cdef, QSet<QByteArray> *requiredQtC for (int i = 0; i < cdef->propertyList.count(); ++i) { const PropertyDef &p = cdef->propertyList.at(i); - foreach (const QByteArray candidate, candidates) { + foreach (const QByteArray &candidate, candidates) { if (p.type.contains(candidate + "<")) requiredQtContainers->insert(candidate); } @@ -821,7 +829,7 @@ static void findRequiredContainers(ClassDef *cdef, QSet<QByteArray> *requiredQtC for (int i = 0; i < allFunctions.count(); ++i) { const FunctionDef &f = allFunctions.at(i); foreach (const ArgumentDef &arg, f.arguments) { - foreach (const QByteArray candidate, candidates) { + foreach (const QByteArray &candidate, candidates) { if (arg.normalizedType.contains(candidate + "<")) requiredQtContainers->insert(candidate); } |