diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-24 10:50:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-24 08:55:06 +0000 |
| commit | c3c3ee6def18ec292340983629e80d350d6e53c0 (patch) | |
| tree | f03893e9c47e58d5a8498aa61a3277b227e58ec7 /src/quick/scenegraph/coreapi | |
| parent | 70d15c4611beef7efe7a3a245ad7e54cd369b953 (diff) | |
Revert "Revert "Temporarily provide old Type enums in QSGGeometry""
To have a new qt5.git dev integration for qtlocation, we need to
have the temporary solution in qtdeclartive dev.
This reverts commit 9c1e07cd07de3a762e1d8386efdac3c72018a35a.
Change-Id: Ic58d7b66a3ba61dd3f4dd575efbe5d090c504073
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, 9 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index 7a916610e3..00acb51c8a 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -88,7 +88,15 @@ public: UnsignedShortType = 0x1403, IntType = 0x1404, UnsignedIntType = 0x1405, - FloatType = 0x1406 + FloatType = 0x1406, + + TypeByte = ByteType, + TypeUnsignedByte = UnsignedByteType, + TypeShort = ShortType, + TypeUnsignedShort = UnsignedShortType, + TypeInt = IntType, + TypeUnsignedInt = UnsignedIntType, + TypeFloat = FloatType }; struct Q_QUICK_EXPORT Attribute |