Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/qml/jsruntime/qv4variantobject.cpp
	src/qml/types/qquickworkerscript.cpp
	src/quick/scenegraph/util/qsgdefaultpainternode_p.h
	tools/qmljs/qmljs.cpp

Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
index 2644c693ce..a318ce23f7 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
@@ -585,31 +585,31 @@ QSGD3D12Format QSGD3D12Engine::toDXGIFormat(QSGGeometry::Type sgtype, int tupleS
                                                   FmtFloat4 };
 
     switch (sgtype) {
-    case QSGGeometry::TypeUnsignedByte:
+    case QSGGeometry::UnsignedByteType:
         format = formatMap_ub[tupleSize];
         if (size)
             *size = tupleSize;
         break;
-    case QSGGeometry::TypeFloat:
+    case QSGGeometry::FloatType:
         format = formatMap_f[tupleSize];
         if (size)
             *size = sizeof(float) * tupleSize;
         break;
 
-    case QSGGeometry::TypeUnsignedShort:
+    case QSGGeometry::UnsignedShortType:
         format = FmtUnsignedShort;
         if (size)
             *size = sizeof(ushort) * tupleSize;
         break;
-    case QSGGeometry::TypeUnsignedInt:
+    case QSGGeometry::UnsignedIntType:
         format = FmtUnsignedInt;
         if (size)
             *size = sizeof(uint) * tupleSize;
         break;
 
-    case QSGGeometry::TypeByte:
-    case QSGGeometry::TypeInt:
-    case QSGGeometry::TypeShort:
+    case QSGGeometry::ByteType:
+    case QSGGeometry::IntType:
+    case QSGGeometry::ShortType:
         qWarning("no mapping for GL type 0x%x", sgtype);
         break;