diff options
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index f74c592e8c..5fe1047426 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -52,6 +52,7 @@ #include "qeasingcurve.h" #include "quuid.h" #include "qvariant.h" +#include "qdatastream.h" #include "qmetatypeswitcher_p.h" #ifndef QT_BOOTSTRAPPED @@ -64,6 +65,7 @@ # include "qjsonobject.h" # include "qjsonarray.h" # include "qjsondocument.h" +# include "qbytearraylist.h" #endif #ifndef QT_NO_GEOM_VARIANT @@ -269,6 +271,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 +310,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 +1193,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 +1419,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 +2414,9 @@ const QMetaObject *metaObjectForQWidget() } } +namespace QtMetaTypePrivate { +const bool VectorBoolElements::true_element = true; +const bool VectorBoolElements::false_element = false; +} + QT_END_NAMESPACE |