Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

18 files changed, 251 insertions, 82 deletions

diff --git a/src/qml/qml/qqmlabstractbinding.cpp b/src/qml/qml/qqmlabstractbinding.cpp
index 39d609454f..b1c320afd4 100644
--- a/src/qml/qml/qqmlabstractbinding.cpp
+++ b/src/qml/qml/qqmlabstractbinding.cpp
@@ -191,7 +191,7 @@ void QQmlAbstractBinding::removeFromObject()
 
 void QQmlAbstractBinding::printBindingLoopError(QQmlProperty &prop)
 {
-    qmlInfo(prop.object()) << QString(QLatin1String("Binding loop detected for property \"%1\"")).arg(prop.name());
+    qmlWarning(prop.object()) << QString(QLatin1String("Binding loop detected for property \"%1\"")).arg(prop.name());
 }
 
 QString QQmlAbstractBinding::expression() const
diff --git a/src/qml/qml/qqmlabstracturlinterceptor.h b/src/qml/qml/qqmlabstracturlinterceptor.h
index dfb8a46027..665b37fb3a 100644
--- a/src/qml/qml/qqmlabstracturlinterceptor.h
+++ b/src/qml/qml/qqmlabstracturlinterceptor.h
@@ -47,7 +47,6 @@ QT_BEGIN_NAMESPACE
 
 class Q_QML_EXPORT QQmlAbstractUrlInterceptor
 {
-    Q_FLAGS(InterceptionPoint)
 public:
     enum DataType { //Matches QQmlDataBlob::Type
         QmlFile = 0,
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index 8a97b7eba7..2a96d96302 100644
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -190,9 +190,14 @@ void QQmlApplicationEnginePrivate::_q_finishLoad(QObject *o)
 /*!
   \fn QQmlApplicationEngine::objectCreated(QObject *object, const QUrl &url)
 
-  This signal is emitted when an object finishes loading. If loading was successful, \a object contains a pointer to the loaded object.
-  Otherwise the pointer is NULL. The \a url loaded is also provided, note that if a QString file path was initially passed to the
-  QQmlApplicationEngine, this url will be the equivalent of QUrl::fromLocalFile(filePath).
+  This signal is emitted when an object finishes loading. If loading was
+  successful, \a object contains a pointer to the loaded object, otherwise
+  the pointer is NULL.
+
+  The \a url to the component the \a object came from is also provided.
+
+  \note If the path to the component was provided as a QString containing a
+  relative path, the \a url will contain a fully resolved path to the file.
 */
 
 /*!
@@ -226,7 +231,7 @@ QQmlApplicationEngine::QQmlApplicationEngine(const QUrl &url, QObject *parent)
   This is provided as a convenience, and is the same as using the empty constructor and calling load afterwards.
 */
 QQmlApplicationEngine::QQmlApplicationEngine(const QString &filePath, QObject *parent)
-    : QQmlApplicationEngine(QUrl::fromLocalFile(filePath), parent)
+    : QQmlApplicationEngine(QUrl::fromUserInput(filePath, QLatin1String("."), QUrl::AssumeLocalFile), parent)
 {
 }
 
@@ -265,7 +270,7 @@ void QQmlApplicationEngine::load(const QUrl &url)
 void QQmlApplicationEngine::load(const QString &filePath)
 {
     Q_D(QQmlApplicationEngine);
-    d->startLoad(QUrl::fromLocalFile(filePath));
+    d->startLoad(QUrl::fromUserInput(filePath, QLatin1String("."), QUrl::AssumeLocalFile));
 }
 
 /*!
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 284ae1f36f..62288a5845 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -163,7 +163,7 @@ void QQmlBinding::update(QQmlPropertyData::WriteFlags flags)
     if (canUseAccessor())
         flags.setFlag(QQmlPropertyData::BypassInterceptor);
 
-    QQmlBindingProfiler prof(ep->profiler, this, function());
+    QQmlBindingProfiler prof(ep->profiler, function());
     doUpdate(watcher, flags, scope);
 
     if (!watcher.wasDeleted())
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 254d5e1907..4fbd828307 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -91,7 +91,7 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index,
         function += QQmlPropertyCache::signalParameterStringForJS(v4, signal.parameterNames(), &error);
 
         if (!error.isEmpty()) {
-            qmlInfo(scopeObject()) << error;
+            qmlWarning(scopeObject()) << error;
             return;
         }
     } else
@@ -129,7 +129,7 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index,
         QString error;
         QQmlPropertyCache::signalParameterStringForJS(engine, signalParameters, &error);
         if (!error.isEmpty()) {
-            qmlInfo(scopeObject()) << error;
+            qmlWarning(scopeObject()) << error;
             return;
         }
         runtimeFunction->updateInternalClass(engine, signalParameters);
@@ -199,7 +199,10 @@ void QQmlBoundSignalExpression::evaluate(void **a)
         //    for several cases (such as QVariant type and QObject-derived types)
         //args[ii] = engine->metaTypeToJS(type, a[ii + 1]);
         if (type == qMetaTypeId<QJSValue>()) {
-            callData->args[ii] = *QJSValuePrivate::getValue(reinterpret_cast<QJSValue *>(a[ii + 1]));
+            if (QV4::Value *v4Value = QJSValuePrivate::getValue(reinterpret_cast<QJSValue *>(a[ii + 1])))
+                callData->args[ii] = *v4Value;
+            else
+                callData->args[ii] = QV4::Encode::undefined();
         } else if (type == QMetaType::QVariant) {
             callData->args[ii] = scope.engine->fromVariant(*((QVariant *)a[ii + 1]));
         } else if (type == QMetaType::Int) {
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 6ebcd142fb..50ed58e63d 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -47,8 +47,6 @@
 #include "qqml.h"
 #include "qqmlengine.h"
 #include "qqmlbinding_p.h"
-#include <private/qqmldebugconnector_p.h>
-#include <private/qqmldebugserviceinterfaces_p.h>
 #include "qqmlincubator.h"
 #include "qqmlincubator_p.h"
 #include <private/qqmljavascriptexpression_p.h>
@@ -876,15 +874,6 @@ QQmlComponentPrivate::beginCreate(QQmlContextData *context)
         depthIncreased = false;
     }
 
-    if (rv) {
-        if (QQmlEngineDebugService *service =
-                QQmlDebugConnector::service<QQmlEngineDebugService>()) {
-            if (!context->isInternal)
-                context->asQQmlContextPrivate()->instances.append(rv);
-            service->objectCreated(engine, rv);
-        }
-    }
-
     return rv;
 }
 
@@ -1244,7 +1233,7 @@ void QQmlComponent::createObject(QQmlV4Function *args)
     if (args->length() >= 2) {
         QV4::ScopedValue v(scope, (*args)[1]);
         if (!v->as<QV4::Object>() || v->as<QV4::ArrayObject>()) {
-            qmlInfo(this) << tr("createObject: value is not an object");
+            qmlWarning(this) << tr("createObject: value is not an object");
             args->setReturnValue(QV4::Encode::null());
             return;
         }
@@ -1361,7 +1350,7 @@ void QQmlComponent::incubateObject(QQmlV4Function *args)
         QV4::ScopedValue v(scope, (*args)[1]);
         if (v->isNull()) {
         } else if (!v->as<QV4::Object>() || v->as<QV4::ArrayObject>()) {
-            qmlInfo(this) << tr("createObject: value is not an object");
+            qmlWarning(this) << tr("createObject: value is not an object");
             args->setReturnValue(QV4::Encode::null());
             return;
         } else {
diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index 85c91a592a..0b0bbef795 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
     by \a data, which is a block of data previously returned by a call
     to compile().
 
-    Errors should be reported using qmlInfo(object).
+    Errors should be reported using qmlWarning(object).
 
     The \a object will be an instance of the TypeClass specified by QML_REGISTER_CUSTOM_TYPE.
 */
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index c2915c840b..e1fa97b52f 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -436,7 +436,6 @@ The following functions are also on the Qt object.
 
     \list
         \li \c "android" - Android
-        \li \c "blackberry" - BlackBerry OS
         \li \c "ios" - iOS
         \li \c "tvos" - tvOS
         \li \c "linux" - Linux
@@ -444,7 +443,6 @@ The following functions are also on the Qt object.
         \li \c "unix" - Other Unix-based OS
         \li \c "windows" - Windows
         \li \c "winrt" - WinRT / UWP
-        \li \c "winphone" - Windows Phone
     \endlist
     \endtable
 */
@@ -1914,9 +1912,29 @@ void QQmlEnginePrivate::sendExit(int retCode)
 
 static void dumpwarning(const QQmlError &error)
 {
-    QMessageLogger(error.url().toString().toLatin1().constData(),
-                   error.line(), 0).warning().nospace()
-            << qPrintable(error.toString());
+    switch (error.messageType()) {
+    case QtDebugMsg:
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).debug().nospace()
+                << qPrintable(error.toString());
+        break;
+    case QtInfoMsg:
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).info().nospace()
+                << qPrintable(error.toString());
+        break;
+    case QtWarningMsg:
+    case QtFatalMsg: // fatal does not support streaming, and furthermore, is actually fatal. Probably not desirable for QML.
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).warning().nospace()
+                << qPrintable(error.toString());
+        break;
+    case QtCriticalMsg:
+        QMessageLogger(error.url().toString().toLatin1().constData(),
+                       error.line(), 0).critical().nospace()
+                << qPrintable(error.toString());
+        break;
+    }
 }
 
 static void dumpwarning(const QList<QQmlError> &errors)
@@ -2129,8 +2147,7 @@ bool QQmlEngine::importPlugin(const QString &filePath, const QString &uri, QList
   Returns the directory where SQL and other offline
   storage is placed.
 
-  QQuickWebView and the SQL databases created with openDatabase()
-  are stored here.
+  The SQL databases created with openDatabase() are stored here.
 
   The default is QML/OfflineStorage in the platform-standard
   user application data directory.
diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp
index 0a6c7b4960..7a1e02eec6 100644
--- a/src/qml/qml/qqmlerror.cpp
+++ b/src/qml/qml/qqmlerror.cpp
@@ -85,11 +85,12 @@ public:
     QString description;
     quint16 line;
     quint16 column;
+    QtMsgType messageType;
     QObject *object;
 };
 
 QQmlErrorPrivate::QQmlErrorPrivate()
-: line(0), column(0), object()
+: line(0), column(0), messageType(QtMsgType::QtWarningMsg), object()
 {
 }
 
@@ -119,12 +120,14 @@ QQmlError &QQmlError::operator=(const QQmlError &other)
         delete d;
         d = 0;
     } else {
-        if (!d) d = new QQmlErrorPrivate;
+        if (!d)
+            d = new QQmlErrorPrivate;
         d->url = other.d->url;
         d->description = other.d->description;
         d->line = other.d->line;
         d->column = other.d->column;
         d->object = other.d->object;
+        d->messageType = other.d->messageType;
     }
     return *this;
 }
@@ -150,8 +153,9 @@ bool QQmlError::isValid() const
 */
 QUrl QQmlError::url() const
 {
-    if (d) return d->url;
-    else return QUrl();
+    if (d)
+        return d->url;
+    return QUrl();
 }
 
 /*!
@@ -159,7 +163,8 @@ QUrl QQmlError::url() const
 */
 void QQmlError::setUrl(const QUrl &url)
 {
-    if (!d) d = new QQmlErrorPrivate;
+    if (!d)
+        d = new QQmlErrorPrivate;
     d->url = url;
 }
 
@@ -168,8 +173,9 @@ void QQmlError::setUrl(const QUrl &url)
 */
 QString QQmlError::description() const
 {
-    if (d) return d->description;
-    else return QString();
+    if (d)
+        return d->description;
+    return QString();
 }
 
 /*!
@@ -177,7 +183,8 @@ QString QQmlError::description() const
 */
 void QQmlError::setDescription(const QString &description)
 {
-    if (!d) d = new QQmlErrorPrivate;
+    if (!d)
+        d = new QQmlErrorPrivate;
     d->description = description;
 }
 
@@ -186,8 +193,9 @@ void QQmlError::setDescription(const QString &description)
 */
 int QQmlError::line() const
 {
-    if (d) return qmlSourceCoordinate(d->line);
-    else return -1;
+    if (d)
+        return qmlSourceCoordinate(d->line);
+    return -1;
 }
 
 /*!
@@ -195,7 +203,8 @@ int QQmlError::line() const
 */
 void QQmlError::setLine(int line)
 {
-    if (!d) d = new QQmlErrorPrivate;
+    if (!d)
+        d = new QQmlErrorPrivate;
     d->line = qmlSourceCoordinate(line);
 }
 
@@ -204,8 +213,9 @@ void QQmlError::setLine(int line)
 */
 int QQmlError::column() const
 {
-    if (d) return qmlSourceCoordinate(d->column);
-    else return -1;
+    if (d)
+        return qmlSourceCoordinate(d->column);
+    return -1;
 }
 
 /*!
@@ -213,7 +223,8 @@ int QQmlError::column() const
 */
 void QQmlError::setColumn(int column)
 {
-    if (!d) d = new QQmlErrorPrivate;
+    if (!d)
+        d = new QQmlErrorPrivate;
     d->column = qmlSourceCoordinate(column);
 }
 
@@ -225,8 +236,9 @@ void QQmlError::setColumn(int column)
  */
 QObject *QQmlError::object() const
 {
-    if (d) return d->object;
-    else return 0;
+    if (d)
+        return d->object;
+    return 0;
 }
 
 /*!
@@ -234,11 +246,37 @@ QObject *QQmlError::object() const
  */
 void QQmlError::setObject(QObject *object)
 {
-    if (!d) d = new QQmlErrorPrivate;
+    if (!d)
+        d = new QQmlErrorPrivate;
     d->object = object;
 }
 
 /*!
+    \since 5.9
+
+    Returns the message type.
+ */
+QtMsgType QQmlError::messageType() const
+{
+    if (d)
+        return d->messageType;
+    return QtMsgType::QtWarningMsg;
+}
+
+/*!
+    \since 5.9
+
+    Sets the \a messageType for this message. The message type determines which
+    QDebug handlers are responsible for recieving the message.
+ */
+void QQmlError::setMessageType(QtMsgType messageType)
+{
+    if (!d)
+        d = new QQmlErrorPrivate;
+    d->messageType = messageType;
+}
+
+/*!
     Returns the error as a human readable string.
 */
 QString QQmlError::toString() const
diff --git a/src/qml/qml/qqmlerror.h b/src/qml/qml/qqmlerror.h
index e4c42223cf..ef529e3828 100644
--- a/src/qml/qml/qqmlerror.h
+++ b/src/qml/qml/qqmlerror.h
@@ -47,6 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
+// ### Qt 6: should this be called QQmlMessage, since it can have a message type?
 class QDebug;
 class QQmlErrorPrivate;
 class Q_QML_EXPORT QQmlError
@@ -69,6 +70,8 @@ public:
     void setColumn(int);
     QObject *object() const;
     void setObject(QObject *);
+    QtMsgType messageType() const;
+    void setMessageType(QtMsgType messageType);
 
     QString toString() const;
 private:
diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp
index ca19691e93..097fa71200 100644
--- a/src/qml/qml/qqmlextensionplugin.cpp
+++ b/src/qml/qml/qqmlextensionplugin.cpp
@@ -117,4 +117,14 @@ void QQmlExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
     Q_UNUSED(uri);
 }
 
+/*!
+  \class QQmlExtensionInterface
+  \internal
+  \inmodule QtQml
+
+  \class QQmlTypesExtensionInterface
+  \internal
+  \inmodule QtQml
+*/
+
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlinfo.cpp b/src/qml/qml/qqmlinfo.cpp
index 5b6e02d5b1..dae15e2eca 100644
--- a/src/qml/qml/qqmlinfo.cpp
+++ b/src/qml/qml/qqmlinfo.cpp
@@ -50,13 +50,45 @@
 QT_BEGIN_NAMESPACE
 
 /*!
+    \fn QQmlInfo QtQml::qmlDebug(const QObject *object)
+    \relates QQmlEngine
+    \since 5.9
+
+    Prints debug messages that include the file and line number for the
+    specified QML \a object.
+
+    When QML types produce logging messages, it improves traceability
+    if they include the QML file and line number on which the
+    particular instance was instantiated.
+
+    To include the file and line number, an object must be passed.  If
+    the file and line number is not available for that instance
+    (either it was not instantiated by the QML engine or location
+    information is disabled), "unknown location" will be used instead.
+
+    For example,
+
+    \code
+    qmlDebug(object) << "Internal state: 42";
+    \endcode
+
+    prints
+
+    \code
+    QML MyCustomType (unknown location): Internal state: 42
+    \endcode
+
+    \sa QtQml::qmlInfo, QtQml::qmlWarning
+*/
+
+/*!
     \fn QQmlInfo QtQml::qmlInfo(const QObject *object)
     \relates QQmlEngine
 
-    Prints warning messages that include the file and line number for the
+    Prints informational messages that include the file and line number for the
     specified QML \a object.
 
-    When QML types display warning messages, it improves traceability
+    When QML types produce logging messages, it improves traceability
     if they include the QML file and line number on which the
     particular instance was instantiated.
 
@@ -76,14 +108,58 @@ QT_BEGIN_NAMESPACE
     \code
     QML MyCustomType (unknown location): component property is a write-once property
     \endcode
+
+    \note In versions prior to Qt 5.9, qmlInfo reported messages using a warning
+    QtMsgType. For Qt 5.9 and above, qmlInfo uses an info QtMsgType. To send
+    warnings, use qmlWarning.
+
+    \sa QtQml::qmlDebug, QtQml::qmlWarning
+*/
+
+
+/*!
+    \fn QQmlInfo QtQml::qmlWarning(const QObject *object)
+    \relates QQmlEngine
+    \since 5.9
+
+    Prints warning messages that include the file and line number for the
+    specified QML \a object.
+
+    When QML types produce logging messages, it improves traceability
+    if they include the QML file and line number on which the
+    particular instance was instantiated.
+
+    To include the file and line number, an object must be passed.  If
+    the file and line number is not available for that instance
+    (either it was not instantiated by the QML engine or location
+    information is disabled), "unknown location" will be used instead.
+
+    For example,
+
+    \code
+    qmlInfo(object) << tr("property cannot be set to 0");
+    \endcode
+
+    prints
+
+    \code
+    QML MyCustomType (unknown location): property cannot be set to 0
+    \endcode
+
+    \sa QtQml::qmlDebug, QtQml::qmlInfo
 */
 
 class QQmlInfoPrivate
 {
 public:
-    QQmlInfoPrivate() : ref (1), object(0) {}
+    QQmlInfoPrivate(QtMsgType type)
+        : ref (1)
+        , msgType(type)
+        , object(nullptr)
+    {}
 
     int ref;
+    QtMsgType msgType;
     const QObject *object;
     QString buffer;
     QList<QQmlError> errors;
@@ -110,6 +186,7 @@ QQmlInfo::~QQmlInfo()
 
         if (!d->buffer.isEmpty()) {
             QQmlError error;
+            error.setMessageType(d->msgType);
 
             QObject *object = const_cast<QObject *>(d->object);
 
@@ -139,28 +216,32 @@ QQmlInfo::~QQmlInfo()
 
 namespace QtQml {
 
-QQmlInfo qmlInfo(const QObject *me)
-{
-    QQmlInfoPrivate *d = new QQmlInfoPrivate;
-    d->object = me;
-    return QQmlInfo(d);
-}
+#define MESSAGE_FUNCS(FuncName, MessageLevel) \
+    QQmlInfo FuncName(const QObject *me) \
+    { \
+        QQmlInfoPrivate *d = new QQmlInfoPrivate(MessageLevel); \
+        d->object = me; \
+        return QQmlInfo(d); \
+    } \
+    QQmlInfo FuncName(const QObject *me, const QQmlError &error) \
+    { \
+        QQmlInfoPrivate *d = new QQmlInfoPrivate(MessageLevel); \
+        d->object = me; \
+        d->errors << error; \
+        return QQmlInfo(d); \
+    } \
+    QQmlInfo FuncName(const QObject *me, const QList<QQmlError> &errors) \
+    { \
+        QQmlInfoPrivate *d = new QQmlInfoPrivate(MessageLevel); \
+        d->object = me; \
+        d->errors = errors; \
+        return QQmlInfo(d); \
+    }
 
-QQmlInfo qmlInfo(const QObject *me, const QQmlError &error)
-{
-    QQmlInfoPrivate *d = new QQmlInfoPrivate;
-    d->object = me;
-    d->errors << error;
-    return QQmlInfo(d);
-}
+MESSAGE_FUNCS(qmlDebug, QtMsgType::QtDebugMsg)
+MESSAGE_FUNCS(qmlInfo, QtMsgType::QtInfoMsg)
+MESSAGE_FUNCS(qmlWarning, QtMsgType::QtWarningMsg)
 
-QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors)
-{
-    QQmlInfoPrivate *d = new QQmlInfoPrivate;
-    d->object = me;
-    d->errors = errors;
-    return QQmlInfo(d);
-}
 
 } // namespace QtQml
 
diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h
index ab0281a688..673125632e 100644
--- a/src/qml/qml/qqmlinfo.h
+++ b/src/qml/qml/qqmlinfo.h
@@ -48,11 +48,19 @@ QT_BEGIN_NAMESPACE
 
 class QQmlInfo;
 
+// declared in namespace to avoid symbol conflicts with QtDeclarative
 namespace QtQml {
-    // declared in namespace to avoid symbol conflicts with QtDeclarative
+    Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me);
+    Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QQmlError &error);
+    Q_QML_EXPORT QQmlInfo qmlDebug(const QObject *me, const QList<QQmlError> &errors);
+
     Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me);
     Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error);
     Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors);
+
+    Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me);
+    Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QQmlError &error);
+    Q_QML_EXPORT QQmlInfo qmlWarning(const QObject *me, const QList<QQmlError> &errors);
 }
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wheader-hygiene")
@@ -93,9 +101,15 @@ public:
 #endif
 
 private:
+    friend Q_QML_EXPORT QQmlInfo QtQml::qmlDebug(const QObject *me);
+    friend Q_QML_EXPORT QQmlInfo QtQml::qmlDebug(const QObject *me, const QQmlError &error);
+    friend Q_QML_EXPORT QQmlInfo QtQml::qmlDebug(const QObject *me, const QList<QQmlError> &errors);
     friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me);
     friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QQmlError &error);
     friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QList<QQmlError> &errors);
+    friend Q_QML_EXPORT QQmlInfo QtQml::qmlWarning(const QObject *me);
+    friend Q_QML_EXPORT QQmlInfo QtQml::qmlWarning(const QObject *me, const QQmlError &error);
+    friend Q_QML_EXPORT QQmlInfo QtQml::qmlWarning(const QObject *me, const QList<QQmlError> &errors);
 
     QQmlInfo(QQmlInfoPrivate *);
     QQmlInfoPrivate *d;
diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp
index a719956483..edd93ef03d 100644
--- a/src/qml/qml/qqmllist.cpp
+++ b/src/qml/qml/qqmllist.cpp
@@ -335,7 +335,7 @@ int QQmlListReference::count() const
 \since 5.0
 \inmodule QtQml
 \brief The QQmlListProperty class allows applications to expose list-like
-properties to QML.
+properties of QObject-derived classes to QML.
 
 QML has many list properties, where more than one object value can be assigned.
 The use of a list property from QML looks like this:
@@ -369,7 +369,8 @@ QML list properties are type-safe - in this case \c {Fruit} is a QObject type th
 
 The \l {Qt Quick 1} version of this class is named QDeclarativeListProperty.
 
-\note QQmlListProperty can only be used for lists of QObject-derived object pointers.
+\sa {Extending QML - Object and List Property Types Example}
+
 */
 
 /*!
diff --git a/src/qml/qml/qqmlloggingcategory.cpp b/src/qml/qml/qqmlloggingcategory.cpp
index 70e59db07b..764b874131 100644
--- a/src/qml/qml/qqmlloggingcategory.cpp
+++ b/src/qml/qml/qqmlloggingcategory.cpp
@@ -112,13 +112,13 @@ void QQmlLoggingCategory::componentComplete()
 {
     m_initialized = true;
     if (m_name.isNull())
-        qmlInfo(this) << QLatin1String("Declaring the name of the LoggingCategory is mandatory and cannot be changed later !");
+        qmlWarning(this) << QLatin1String("Declaring the name of the LoggingCategory is mandatory and cannot be changed later !");
 }
 
 void QQmlLoggingCategory::setName(const QString &name)
 {
     if (m_initialized) {
-        qmlInfo(this) << QLatin1String("The name of a LoggingCategory cannot be changed after the Item is created");
+        qmlWarning(this) << QLatin1String("The name of a LoggingCategory cannot be changed after the Item is created");
         return;
     }
 
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 2e2a3fb303..09936f6e7a 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -53,6 +53,8 @@
 #include <private/qqmlscriptstring_p.h>
 #include <private/qqmlpropertyvalueinterceptor_p.h>
 #include <private/qqmlvaluetypeproxybinding_p.h>
+#include <private/qqmldebugconnector_p.h>
+#include <private/qqmldebugserviceinterfaces_p.h>
 
 QT_USE_NAMESPACE
 
@@ -216,6 +218,17 @@ QObject *QQmlObjectCreator::create(int subComponentIndex, QObject *parent, QQmlI
 
     phase = ObjectsCreated;
 
+    if (instance) {
+        if (QQmlEngineDebugService *service
+                = QQmlDebugConnector::service<QQmlEngineDebugService>()) {
+            if (!parentContext->isInternal)
+                parentContext->asQQmlContextPrivate()->instances.append(instance);
+            service->objectCreated(engine, instance);
+        } else if (!parentContext->isInternal && QQmlDebugConnector::service<QV4DebugService>()) {
+            parentContext->asQQmlContextPrivate()->instances.append(instance);
+        }
+    }
+
     return instance;
 }
 
diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp
index a47a0ab4a4..64ca208f1b 100644
--- a/src/qml/qml/qqmlplatform.cpp
+++ b/src/qml/qml/qqmlplatform.cpp
@@ -59,16 +59,12 @@ QString QQmlPlatform::os()
 {
 #if defined(Q_OS_ANDROID)
     return QStringLiteral("android");
-#elif defined(Q_OS_BLACKBERRY)
-    return QStringLiteral("blackberry");
 #elif defined(Q_OS_IOS)
     return QStringLiteral("ios");
 #elif defined(Q_OS_TVOS)
     return QStringLiteral("tvos");
 #elif defined(Q_OS_MAC)
     return QStringLiteral("osx");
-#elif defined(Q_OS_WINPHONE)
-    return QStringLiteral("winphone");
 #elif defined(Q_OS_WINRT)
     return QStringLiteral("winrt");
 #elif defined(Q_OS_WIN)
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 76ac15e2f1..ac993a1037 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2428,7 +2428,7 @@ void QQmlTypeData::continueLoadFromIR()
 
     QList<QQmlError> errors;
 
-    foreach (const QV4::CompiledData::Import *import, m_document->imports) {
+    for (const QV4::CompiledData::Import *import : qAsConst(m_document->imports)) {
         if (!addImport(import, &errors)) {
             Q_ASSERT(errors.size());
             QQmlError error(errors.takeFirst());