diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-13 15:26:44 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-13 14:04:12 +0000 |
| commit | 24d4c9b3cd609213fa276fb9c27aadcaff5ab817 (patch) | |
| tree | e884eaf52da2ed8fe614c8f6c2740b8940672336 /src/quick/scenegraph | |
| parent | fa063ccbc2bb2b88a6168f8794874cdea363e049 (diff) | |
Temporarily provide old Type enums in QSGGeometry
Unblock qt5.git integration of dependent modules like qtlocation.
6df6c10e1af827d06a387e7422176dd310cf83be changes the names of the
new-in-5.8 type enums from TypeXxxx to XxxxType as per API review.
However QtLocation already uses the TypeXxxx variants. So provide
a temporary solution by offering both.
Change-Id: Id23db0044f09654bd61b64f401b683a7944cf245
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph')
| -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 |