diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
| commit | 2ff13bdf697adff8574c5cea716627c78fb6b5b3 (patch) | |
| tree | f4eac21b3b54f62d9f79714f40d5c9f4804dfc0c /src/quick/scenegraph/coreapi | |
| parent | 9d487cd6bf8ad75de19a4c05eb3d2641ce4a5289 (diff) | |
| parent | e13eece273195a9f39d29712a233a8dd00ddf71b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I171c7dbb6a74fe743c2eec63e86e9c0bef7c7dfd
Diffstat (limited to 'src/quick/scenegraph/coreapi')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index 00acb51c8a..7a916610e3 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -88,15 +88,7 @@ public: UnsignedShortType = 0x1403, IntType = 0x1404, UnsignedIntType = 0x1405, - FloatType = 0x1406, - - TypeByte = ByteType, - TypeUnsignedByte = UnsignedByteType, - TypeShort = ShortType, - TypeUnsignedShort = UnsignedShortType, - TypeInt = IntType, - TypeUnsignedInt = UnsignedIntType, - TypeFloat = FloatType + FloatType = 0x1406 }; struct Q_QUICK_EXPORT Attribute |