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

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4internalclass.cpp
	src/qml/parser/qqmljslexer.cpp
	src/qml/qml/v8/qv8engine.cpp
	src/qml/util/qqmladaptormodel_p.h
	src/quick/items/qquickanimatedsprite.cpp
	tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp

Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp b/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp
index fca72ab021..cbb7ebb0ff 100644
--- a/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp
+++ b/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp
@@ -182,7 +182,7 @@ void tst_qqmlitemmodels::itemSelection()
     QCOMPARE(object->property("count").toInt(), 5);
     QCOMPARE(object->property("contains").toBool(), true);
 
-    const char *propNames[] = { "itemSelectionRead", "itemSelectionBinding", 0 };
+    const char *propNames[] = { "itemSelectionRead", "itemSelectionBinding", nullptr };
     for (const char **name = propNames; *name; name++) {
         QVariant isVariant = object->property(*name);
         QCOMPARE(isVariant.userType(), qMetaTypeId<QItemSelection>());
@@ -217,7 +217,7 @@ void tst_qqmlitemmodels::modelIndexList()
     QModelIndexList someMIL = object->someModelIndexList();
     QCOMPARE(cppMILVariant.value<QModelIndexList>(), someMIL);
 
-    const char *propNames[] = { "modelIndexListRead", "modelIndexListBinding", 0 };
+    const char *propNames[] = { "modelIndexListRead", "modelIndexListBinding", nullptr };
     for (const char **name = propNames; *name; name++) {
         QVariant milVariant = object->property(*name);
         QCOMPARE(milVariant.userType(), qMetaTypeId<QModelIndexList>());