diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-23 06:45:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-23 13:29:00 +0000 |
| commit | f4391605f4478facc79b2b3bec7113263c975134 (patch) | |
| tree | 4aaa7b3f662f0a52ad07738f7454431a5d4b3d84 /src/quick/scenegraph/coreapi | |
| parent | 5d4cbf4094c9b290626aab89e4bd92edd29ce49f (diff) | |
Revert "Revert "Revert "Temporarily provide old Type enums in QSGGeometry"""
The fix in qtlocation was merged in dev.
This reverts commit c3c3ee6def18ec292340983629e80d350d6e53c0.
Change-Id: I7f1ba6447668b63f3571b5ef684f2ba413334892
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
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 |