aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/coreapi
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2016-10-13 17:08:12 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-19 05:45:10 +0000
commit9c1e07cd07de3a762e1d8386efdac3c72018a35a (patch)
treec1984419672500643197ca474ba90acd9fde888a /src/quick/scenegraph/coreapi
parentf8918c43e88c68e2e447226d6249b47c58539cbc (diff)
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 <liang.qi@qt.io>
Diffstat (limited to 'src/quick/scenegraph/coreapi')
-rw-r--r--src/quick/scenegraph/coreapi/qsggeometry.h10
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