diff options
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 35 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
4 files changed, 41 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 091dfa8d37..5abc2ebd70 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -216,6 +216,7 @@ struct DefinedTypesFilter { \value QChar QChar \value QString QString \value QByteArray QByteArray + \value Nullptr \c{std::nullptr_t} \value VoidStar \c{void *} \value Long \c{long} @@ -287,6 +288,8 @@ struct DefinedTypesFilter { \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 + \omitvalue LastCoreType + \omitvalue LastGuiType Additional types can be registered using Q_DECLARE_METATYPE(). diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 666949f41a..455d0350e0 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -441,6 +441,7 @@ public: QJsonValue = 45, QJsonObject = 46, QJsonArray = 47, QJsonDocument = 48, QByteArrayList = 49, QObjectStar = 39, SChar = 40, Void = 43, + Nullptr = 51, QVariantMap = 8, QVariantList = 9, QVariantHash = 28, QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68, QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73, @@ -448,6 +449,8 @@ public: QMatrix = 79, QTransform = 80, QMatrix4x4 = 81, QVector2D = 82, QVector3D = 83, QVector4D = 84, QQuaternion = 85, QPolygonF = 86, QSizePolicy = 121, + LastCoreType = Nullptr, + LastGuiType = QPolygonF, User = 1024 }; #endif diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index dcd8974848..9473ecbdf5 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -3999,6 +3999,41 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \typedef QVariant::DataPtr \internal */ +/*! \typedef QVariant::f_construct + \internal +*/ + +/*! \typedef QVariant::f_clear + \internal +*/ + +/*! \typedef QVariant::f_null + \internal +*/ + +/*! \typedef QVariant::f_load + \internal +*/ + +/*! \typedef QVariant::f_save + \internal +*/ + +/*! \typedef QVariant::f_compare + \internal +*/ + +/*! \typedef QVariant::f_convert + \internal +*/ + +/*! \typedef QVariant::f_canConvert + \internal +*/ + +/*! \typedef QVariant::f_debugStream + \internal +*/ /*! \fn DataPtr &QVariant::data_ptr() diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 6d4c163e76..29e67e9dd8 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -360,7 +360,6 @@ class Q_CORE_EXPORT QVariant { return canConvert(qMetaTypeId<T>()); } public: -#ifndef Q_QDOC struct PrivateShared { inline PrivateShared(void *v) : ptr(v), ref(1) { } @@ -431,7 +430,6 @@ class Q_CORE_EXPORT QVariant f_canConvert canConvert; f_debugStream debugStream; }; -#endif inline bool operator==(const QVariant &v) const { return cmp(v); } |