summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeremy Katz <jeremy.katz@nokia.com>2012-07-16 22:14:23 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-17 15:56:15 +0200
commit9b13f2b91395f5cabeba654b56597d00f185176c (patch)
treea1acd11597f2b8690cdbfe7ffa0afe6f2dba96ee /src
parenta105365ff2a4d51da05f78192d491b51159c12ff (diff)
Add new metatypes to QMetaType::Type enum for docs
This adds QRegularExpression, QJson{Value,Object,Array,Document}, and SChar Change-Id: I3dbe9d197952e980f0de9eaed2605d190b8d0405 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qmetatype.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index f11f58b48b..165816fdfa 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -230,6 +230,9 @@ public:
QLocale = 18, QRect = 19, QRectF = 20, QSize = 21, QSizeF = 22,
QLine = 23, QLineF = 24, QPoint = 25, QPointF = 26, QRegExp = 27,
QEasingCurve = 29, QUuid = 30, QVariant = 41, QModelIndex = 42,
+ QRegularExpression = 44,
+ QJsonValue = 45, QJsonObject = 46, QJsonArray = 47, QJsonDocument = 48,
+ SChar = 49,
QObjectStar = 39, QWidgetStar = 40,
QVariantMap = 8, QVariantList = 9, QVariantHash = 28,
QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68,