From 9c1e07cd07de3a762e1d8386efdac3c72018a35a Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 13 Oct 2016 17:08:12 +0200 Subject: Revert "Temporarily provide old Type enums in QSGGeometry" After 186e442 in QtLocation migrated to the new XxxxType naming convention, the temporary old names can be removed. This reverts commit 73c2e2395025b7d17cad0fc97d4a09b2adf46fc2. Task-number: QTBUG-56519 Change-Id: Icf9aa5e16e6590a631f65bc669cf7b8d0acc6996 Reviewed-by: Liang Qi --- src/quick/scenegraph/coreapi/qsggeometry.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/quick/scenegraph/coreapi') 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 -- cgit v1.2.3