diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-07 09:57:01 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-12 09:57:43 +0000 |
| commit | 6df6c10e1af827d06a387e7422176dd310cf83be (patch) | |
| tree | 4c343d4f30677147af5a8c64e2fdfc107c7f431f /tests | |
| parent | 51a7d0331ed430d0f81d02c1b690bd12da8fdb3b (diff) | |
Fix enums in QSGGeometry
Minor fixes based on comments from the 5.8 API changes review:
Revert to using Qt-style enum values (POSITION -> PositionAttribute).
Use ByteType, FloatType, etc. instead of TypeByte, TypeFloat, ...
Add comments about magic GL values.
Add missing docs for Attribute::createWithAttributeType().
Change-Id: I1b8242efd3936f000ce8df6c11ff9ab7affb5713
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/geometry/tst_geometry.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/geometry/tst_geometry.cpp b/tests/auto/quick/geometry/tst_geometry.cpp index 470ce3bd91..904f85c4c6 100644 --- a/tests/auto/quick/geometry/tst_geometry.cpp +++ b/tests/auto/quick/geometry/tst_geometry.cpp @@ -126,9 +126,9 @@ void GeometryTest::testCustomGeometry() }; static QSGGeometry::Attribute attributes[] = { - QSGGeometry::Attribute::create(0, 2, QSGGeometry::TypeFloat, false), - QSGGeometry::Attribute::create(1, 4, QSGGeometry::TypeUnsignedByte, false), - QSGGeometry::Attribute::create(2, 4, QSGGeometry::TypeFloat, false) + QSGGeometry::Attribute::create(0, 2, QSGGeometry::FloatType, false), + QSGGeometry::Attribute::create(1, 4, QSGGeometry::UnsignedByteType, false), + QSGGeometry::Attribute::create(2, 4, QSGGeometry::FloatType, false) }; static QSGGeometry::AttributeSet set = { 4, 6 * sizeof(float) + 4 * sizeof(unsigned char), attributes }; |