diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2012-07-16 22:19:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 15:56:15 +0200 |
| commit | f66beaaf07be3ce0511b3cf9e64fc67c90f2ce34 (patch) | |
| tree | 110f4bde460c25792730859de75ef8a4c0703b2c /src/corelib/kernel/qmetatype.h | |
| parent | 9b13f2b91395f5cabeba654b56597d00f185176c (diff) | |
Correct documentation for Void metatype value, define UnknownType
QMetaType::Type::Void was misdocumented as being equal to 0. The
actual value for Void is currently 43. UnknownType is 0.
Change-Id: I4e9cb3b4d21e10e1691b985a6ad635bc7a04f1b7
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 165816fdfa..97a5bf44f4 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -221,7 +221,7 @@ public: #else // If we are using QDoc it fakes the Type enum looks like this. enum Type { - Void = 0, Bool = 1, Int = 2, UInt = 3, LongLong = 4, ULongLong = 5, + UnknownType = 0, Bool = 1, Int = 2, UInt = 3, LongLong = 4, ULongLong = 5, Double = 6, Long = 32, Short = 33, Char = 34, ULong = 35, UShort = 36, UChar = 37, Float = 38, VoidStar = 31, @@ -234,6 +234,7 @@ public: QJsonValue = 45, QJsonObject = 46, QJsonArray = 47, QJsonDocument = 48, SChar = 49, QObjectStar = 39, QWidgetStar = 40, + Void = 43, 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, |