diff options
author | Martin Smith <martin.smith@qt.io> | 2018-01-08 13:44:24 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2018-01-09 06:40:14 +0000 |
commit | 49e2746e16d481e753cb1858f92aaf653210cb34 (patch) | |
tree | 29a8708cdd96a0844af8a6c121be5793f085d463 /src/corelib/kernel/qmetatype.h | |
parent | 32c942ce856572093b0fef2e79b30a80fe8db23e (diff) |
doc: Correct clang parsing errors in qvariant.h
Some old uses of Q_QDOC to prevent the old qdoc C++ parser
from seeing declarations it didn't need to see were preventing
clang from seeing declarations it did need to see. These have
been removed, and some internal documentation has been added to
account for some declarations that suddenly became public but
should not be seen in the Qt API.
Change-Id: Iccf423e5cf8767f0a271150ab59bea54cf90ac46
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |