Cleanupsv5.3.0-beta1

* Get rid of members in QQmlCompiledData that were used by the VME
  and are now unused
* Get rid of QQmlVME friend declarations that are not needed anymore

Change-Id: I11b4b6f0b4b0b60edf92a1256be3d0d44d76bbc9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 11 insertions, 15 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 306552d39c..bc5e4e36d3 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -130,23 +130,19 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte
     QString url;
     QString code;
 
-    int id = scriptPrivate->bindingId;
-    if (id >= 0) {
-        QQmlContextData *ctxtdata = QQmlContextData::get(scriptPrivate->context);
-        QQmlEnginePrivate *engine = QQmlEnginePrivate::get(scriptPrivate->context->engine());
-        if (engine && ctxtdata && !ctxtdata->url.isEmpty()) {
-            QQmlTypeData *typeData = engine->typeLoader.getType(ctxtdata->url);
-            Q_ASSERT(typeData);
-
-            if (QQmlCompiledData *cdata = typeData->compiledData()) {
-                code = cdata->primitives.at(id);
-                url = cdata->name;
-            }
+    QQmlContextData *ctxtdata = QQmlContextData::get(scriptPrivate->context);
+    QQmlEnginePrivate *engine = QQmlEnginePrivate::get(scriptPrivate->context->engine());
+    if (engine && ctxtdata && !ctxtdata->url.isEmpty()) {
+        QQmlTypeData *typeData = engine->typeLoader.getType(ctxtdata->url);
+        Q_ASSERT(typeData);
 
-            typeData->release();
+        if (QQmlCompiledData *cdata = typeData->compiledData()) {
+            url = cdata->name;
         }
-    } else
-        code = scriptPrivate->script;
+
+        typeData->release();
+    }
+    code = scriptPrivate->script;
 
     setNotifyOnValueChanged(true);
     QQmlAbstractExpression::setContext(QQmlContextData::get(ctxt ? ctxt : scriptPrivate->context));