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

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

11 files changed, 47 insertions, 58 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
index d0f9833c2e..029004ffd1 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
@@ -191,22 +191,18 @@ QQmlEngineDebugServiceImpl::propertyData(QObject *obj, int propIdx)
     if (binding)
         rv.binding = binding->expression();
 
-    if (QQmlValueTypeFactory::isValueType(prop.userType())) {
-        rv.type = QQmlObjectProperty::Basic;
-    } else if (QQmlMetaType::isQObject(prop.userType()))  {
+    rv.value = valueContents(prop.read(obj));
+
+    if (QQmlMetaType::isQObject(prop.userType()))  {
         rv.type = QQmlObjectProperty::Object;
     } else if (QQmlMetaType::isList(prop.userType())) {
         rv.type = QQmlObjectProperty::List;
     } else if (prop.userType() == QMetaType::QVariant) {
         rv.type = QQmlObjectProperty::Variant;
+    } else if (rv.value.isValid()) {
+        rv.type = QQmlObjectProperty::Basic;
     }
 
-    QVariant value;
-    if (rv.type != QQmlObjectProperty::Unknown && prop.userType() != 0) {
-        value = prop.read(obj);
-    }
-    rv.value = valueContents(value);
-
     return rv;
 }
 
@@ -269,10 +265,10 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const
                         return s;
                 }
             }
-
-            if (isSaveable(value))
-                return value;
         }
+
+        if (isSaveable(value))
+            return value;
     }
 
     if (QQmlMetaType::isQObject(userType)) {
@@ -494,7 +490,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
     QQmlDebugPacket ds(message);
 
     QByteArray type;
-    int queryId;
+    qint32 queryId;
     ds >> type >> queryId;
 
     QQmlDebugPacket rs;
@@ -507,13 +503,13 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
             QJSEngine *engine = m_engines.at(ii);
 
             QString engineName = engine->objectName();
-            int engineId = QQmlDebugService::idForObject(engine);
+            qint32 engineId = QQmlDebugService::idForObject(engine);
 
             rs << engineName << engineId;
         }
 
     } else if (type == "LIST_OBJECTS") {
-        int engineId = -1;
+        qint32 engineId = -1;
         ds >> engineId;
 
         QQmlEngine *engine =
@@ -536,7 +532,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         }
 
     } else if (type == "FETCH_OBJECT") {
-        int objectId;
+        qint32 objectId;
         bool recurse;
         bool dumpProperties = true;
 
@@ -554,8 +550,8 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
 
     } else if (type == "FETCH_OBJECTS_FOR_LOCATION") {
         QString file;
-        int lineNumber;
-        int columnNumber;
+        qint32 lineNumber;
+        qint32 columnNumber;
         bool recurse;
         bool dumpProperties = true;
 
@@ -573,7 +569,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         }
 
     } else if (type == "WATCH_OBJECT") {
-        int objectId;
+        qint32 objectId;
 
         ds >> objectId;
         bool ok = m_watch->addWatch(queryId, objectId);
@@ -581,7 +577,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         rs << QByteArray("WATCH_OBJECT_R") << queryId << ok;
 
     } else if (type == "WATCH_PROPERTY") {
-        int objectId;
+        qint32 objectId;
         QByteArray property;
 
         ds >> objectId >> property;
@@ -590,7 +586,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         rs << QByteArray("WATCH_PROPERTY_R") << queryId << ok;
 
     } else if (type == "WATCH_EXPR_OBJECT") {
-        int debugId;
+        qint32 debugId;
         QString expr;
 
         ds >> debugId >> expr;
@@ -604,11 +600,11 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         rs << QByteArray("NO_WATCH_R") << queryId << ok;
 
     } else if (type == "EVAL_EXPRESSION") {
-        int objectId;
+        qint32 objectId;
         QString expr;
 
         ds >> objectId >> expr;
-        int engineId = -1;
+        qint32 engineId = -1;
         if (!ds.atEnd())
             ds >> engineId;
 
@@ -636,12 +632,12 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         rs << QByteArray("EVAL_EXPRESSION_R") << queryId << result;
 
     } else if (type == "SET_BINDING") {
-        int objectId;
+        qint32 objectId;
         QString propertyName;
         QVariant expr;
         bool isLiteralValue;
         QString filename;
-        int line;
+        qint32 line;
         ds >> objectId >> propertyName >> expr >> isLiteralValue >>
               filename >> line;
         bool ok = setBinding(objectId, propertyName, expr, isLiteralValue,
@@ -650,7 +646,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         rs << QByteArray("SET_BINDING_R") << queryId << ok;
 
     } else if (type == "RESET_BINDING") {
-        int objectId;
+        qint32 objectId;
         QString propertyName;
         ds >> objectId >> propertyName;
         bool ok = resetBinding(objectId, propertyName);
@@ -658,7 +654,7 @@ void QQmlEngineDebugServiceImpl::processMessage(const QByteArray &message)
         rs << QByteArray("RESET_BINDING_R") << queryId << ok;
 
     } else if (type == "SET_METHOD_BODY") {
-        int objectId;
+        qint32 objectId;
         QString methodName;
         QString methodBody;
         ds >> objectId >> methodName >> methodBody;
@@ -821,7 +817,8 @@ bool QQmlEngineDebugServiceImpl::setMethodBody(int objectId, const QString &meth
     return true;
 }
 
-void QQmlEngineDebugServiceImpl::propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value)
+void QQmlEngineDebugServiceImpl::propertyChanged(
+        qint32 id, qint32 objectId, const QMetaProperty &property, const QVariant &value)
 {
     QQmlDebugPacket rs;
     rs << QByteArray("UPDATE_WATCH") << id << objectId << QByteArray(property.name()) << valueContents(value);
@@ -852,14 +849,14 @@ void QQmlEngineDebugServiceImpl::objectCreated(QJSEngine *engine, QObject *objec
     if (!m_engines.contains(engine))
         return;
 
-    int engineId = QQmlDebugService::idForObject(engine);
-    int objectId = QQmlDebugService::idForObject(object);
-    int parentId = QQmlDebugService::idForObject(object->parent());
+    qint32 engineId = QQmlDebugService::idForObject(engine);
+    qint32 objectId = QQmlDebugService::idForObject(object);
+    qint32 parentId = QQmlDebugService::idForObject(object->parent());
 
     QQmlDebugPacket rs;
 
     //unique queryId -1
-    rs << QByteArray("OBJECT_CREATED") << -1 << engineId << objectId << parentId;
+    rs << QByteArray("OBJECT_CREATED") << qint32(-1) << engineId << objectId << parentId;
     emit messageToClient(name(), rs.data());
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
index c0c24058eb..741768cd00 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
@@ -111,7 +111,8 @@ private:
     friend class QQmlDebuggerServiceFactory;
 
     void processMessage(const QByteArray &msg);
-    void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
+    void propertyChanged(qint32 id, qint32 objectId, const QMetaProperty &property,
+                         const QVariant &value);
 
     void prepareDeferredObjects(QObject *);
     void buildObjectList(QDataStream &, QQmlContext *,
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp
index 86571e6cbe..8caa5ac23e 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp
@@ -109,12 +109,7 @@ QQmlWatchProxy::QQmlWatchProxy(int id,
 
 void QQmlWatchProxy::notifyValueChanged()
 {
-    QVariant v;
-    if (m_expr)
-        v = m_expr->evaluate();
-    else if (QQmlValueTypeFactory::isValueType(m_property.userType()))
-        v = m_property.read(m_object);
-
+    const QVariant v = m_expr ? m_expr->evaluate() : m_property.read(m_object);
     emit m_watch->propertyChanged(m_id, m_debugId, m_property, v);
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 2d5282b48c..cc663cd6b3 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -506,7 +506,7 @@ void QQmlDebugServerImpl::receiveMessage()
             in >> m_clientPlugins;
 
             for (DebugServiceConstIt iter = m_plugins.constBegin(), cend = m_plugins.constEnd(); iter != cend; ++iter) {
-                const QString pluginName = iter.key();
+                const QString &pluginName = iter.key();
                 QQmlDebugService::State newState = QQmlDebugService::Unavailable;
                 if (m_clientPlugins.contains(pluginName))
                     newState = QQmlDebugService::Enabled;
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp
index 0d501f48c0..4a6894e69e 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp
@@ -148,7 +148,7 @@ void QSGD3D12RenderLoop::windowDestroyed(QQuickWindow *window)
     delete rc;
     delete engine;
 
-    delete wd->animationController;
+    wd->animationController.reset();
 }
 
 void QSGD3D12RenderLoop::exposeWindow(QQuickWindow *window)
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp
index f505df1e5a..4302a9119b 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp
@@ -373,7 +373,7 @@ bool QSGD3D12RenderThread::event(QEvent *e)
                 QCoreApplication::processEvents();
                 QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
                 if (wme->destroying)
-                    delete wd->animationController;
+                    wd->animationController.reset();
             }
             if (wme->destroying)
                 active = false;
@@ -1006,7 +1006,7 @@ void QSGD3D12ThreadedRenderLoop::handleExposure(QQuickWindow *window)
         if (Q_UNLIKELY(debug_loop()))
             qDebug("starting render thread");
         // Push a few things to the render thread.
-        QQuickAnimatorController *controller = QQuickWindowPrivate::get(w->window)->animationController;
+        QQuickAnimatorController *controller = QQuickWindowPrivate::get(w->window)->animationController.data();
         if (controller->thread() != w->thread)
             controller->moveToThread(w->thread);
         if (w->thread->thread() == QThread::currentThread()) {
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
index 1736a2098e..a5231e15d1 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
@@ -76,6 +76,7 @@ void QSGOpenVGRenderContext::initialize(const QSGRenderContext::InitParams *para
 
     m_vgContext = vgparams->context;
     QSGRenderContext::initialize(params);
+    emit initialized();
 }
 
 void QSGOpenVGRenderContext::invalidate()
@@ -84,6 +85,7 @@ void QSGOpenVGRenderContext::invalidate()
     delete m_glyphCacheManager;
     m_glyphCacheManager = nullptr;
     QSGRenderContext::invalidate();
+    emit invalidated();
 }
 
 void QSGOpenVGRenderContext::renderNextFrame(QSGRenderer *renderer, uint fboId)
diff --git a/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp b/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp
index d728686248..2c71c1610a 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp
@@ -211,21 +211,14 @@ void QSGOpenVGInternalRectangleNode::render()
     } else {
         vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
         vgLoadIdentity();
-        if (m_radius > 0) {
-            // Fallback to rendering to an image for rounded rects with perspective transforms
-            if (m_offscreenSurface == nullptr || m_offscreenSurface->size() != QSize(std::ceil(m_rect.width()), std::ceil(m_rect.height()))) {
-                delete m_offscreenSurface;
-                m_offscreenSurface = new QOpenVGOffscreenSurface(QSize(std::ceil(m_rect.width()), std::ceil(m_rect.height())));
-            }
-
-            m_offscreenSurface->makeCurrent();
-        } else if (m_offscreenSurface) {
+        // Fallback to rendering to an image for rounded rects with perspective transforms
+        if (m_offscreenSurface == nullptr || m_offscreenSurface->size() != QSize(std::ceil(m_rect.width()), std::ceil(m_rect.height()))) {
             delete m_offscreenSurface;
-            m_offscreenSurface = nullptr;
+            m_offscreenSurface = new QOpenVGOffscreenSurface(QSize(std::ceil(m_rect.width()), std::ceil(m_rect.height())));
         }
+        m_offscreenSurface->makeCurrent();
     }
 
-
     // If path is dirty
     if (m_pathDirty) {
         vgClearPath(m_rectanglePath, VG_PATH_CAPABILITY_APPEND_TO);
@@ -291,7 +284,7 @@ void QSGOpenVGInternalRectangleNode::render()
         vgDrawPath(m_rectanglePath, VG_FILL_PATH);
     }
 
-    if (!transform().isAffine() && m_radius > 0) {
+    if (!transform().isAffine()) {
         m_offscreenSurface->doneCurrent();
         //  Render offscreen surface
         vgSeti(VG_MATRIX_MODE, VG_MATRIX_IMAGE_USER_TO_SURFACE);
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp b/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp
index 94f7f76036..85651ece9d 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp
@@ -96,7 +96,7 @@ void QSGOpenVGRenderLoop::windowDestroyed(QQuickWindow *window)
         vg->doneCurrent();
     }
 
-    delete d->animationController;
+    d->animationController.reset();
 }
 
 void QSGOpenVGRenderLoop::exposureChanged(QQuickWindow *window)
@@ -187,6 +187,7 @@ void QSGOpenVGRenderLoop::renderWindow(QQuickWindow *window)
     data.updatePending = false;
 
     if (!data.grabOnly) {
+        cd->flushFrameSynchronousEvents();
         // Event delivery/processing triggered the window to be deleted or stop rendering.
         if (!m_windows.contains(window))
             return;
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp
index fb24df7471..1b75d450aa 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.cpp
@@ -52,7 +52,7 @@ QSGOpenVGSpriteNode::QSGOpenVGSpriteNode()
 
 QSGOpenVGSpriteNode::~QSGOpenVGSpriteNode()
 {
-
+    delete m_texture;
 }
 
 void QSGOpenVGSpriteNode::setTexture(QSGTexture *texture)
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h
index d47b389a0b..dba4e663be 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgspritenode.h
@@ -66,7 +66,7 @@ public:
     void render() override;
 
 private:
-    QSGOpenVGTexture *m_texture;
+    QSGOpenVGTexture *m_texture = nullptr;
     float m_time;
     QPoint m_sourceA;
     QPoint m_sourceB;