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, 1 insertions, 1 deletions

diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp
index f38307b1f7..66addee2e8 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapterfactory.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 QQmlAbstractProfilerAdapter *QQuickProfilerAdapterFactory::create(const QString &key)
 {
     if (key != QLatin1String("QQuickProfilerAdapter"))
-        return 0;
+        return nullptr;
     return new QQuickProfilerAdapter(this);
 }