diff options
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index f74c592e8c..311648c33a 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** 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. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** 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 +** 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. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** 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 +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -52,6 +44,7 @@ #include "qeasingcurve.h" #include "quuid.h" #include "qvariant.h" +#include "qdatastream.h" #include "qmetatypeswitcher_p.h" #ifndef QT_BOOTSTRAPPED @@ -64,6 +57,7 @@ # include "qjsonobject.h" # include "qjsonarray.h" # include "qjsondocument.h" +# include "qbytearraylist.h" #endif #ifndef QT_NO_GEOM_VARIANT @@ -269,6 +263,7 @@ struct DefinedTypesFilter { \value QJsonDocument QJsonDocument \value QModelIndex QModelIndex \value QUuid QUuid + \value QByteArrayList QByteArrayList \value User Base value for user types \value UnknownType This is an invalid type id. It is returned from QMetaType for types that are not registered @@ -307,7 +302,7 @@ struct DefinedTypesFilter { name to a type so that it can be created and destructed dynamically at run-time. Declare new types with Q_DECLARE_METATYPE() to make them available to QVariant and other template-based functions. - Call qRegisterMetaType() to make type available to non-template based + Call qRegisterMetaType() to make types available to non-template based functions, such as the queued signal and slot connections. Any class or struct that has a public default @@ -1190,6 +1185,9 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QVariant: stream << *static_cast<const NS(QVariant)*>(data); break; + case QMetaType::QByteArrayList: + stream << *static_cast<const NS(QByteArrayList)*>(data); + break; #endif case QMetaType::QByteArray: stream << *static_cast<const NS(QByteArray)*>(data); @@ -1413,6 +1411,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QVariant: stream >> *static_cast< NS(QVariant)*>(data); break; + case QMetaType::QByteArrayList: + stream >> *static_cast< NS(QByteArrayList)*>(data); + break; #endif case QMetaType::QByteArray: stream >> *static_cast< NS(QByteArray)*>(data); @@ -2405,4 +2406,9 @@ const QMetaObject *metaObjectForQWidget() } } +namespace QtMetaTypePrivate { +const bool VectorBoolElements::true_element = true; +const bool VectorBoolElements::false_element = false; +} + QT_END_NAMESPACE |