Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4

Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/qml/debugger/qv8debugservice.cpp
	src/qml/qml/qml.pri
	src/qml/qml/qqmlcompiler.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlcontext.cpp
	src/qml/qml/qqmldata_p.h
	src/qml/qml/qqmlengine_p.h
	src/qml/qml/qqmljavascriptexpression.cpp
	src/qml/qml/qqmlxmlhttprequest.cpp
	src/qml/qml/v4/qv4bindings.cpp
	src/qml/qml/v4/qv4irbuilder.cpp
	src/qml/qml/v4/qv4jsonobject_p.h
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	src/qml/qml/v8/qv8bindings.cpp
	src/qml/qml/v8/qv8contextwrapper.cpp
	src/qml/qml/v8/qv8listwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/qml/qml/v8/qv8qobjectwrapper_p.h
	src/qml/qml/v8/qv8sequencewrapper_p_p.h
	src/qml/qml/v8/qv8typewrapper.cpp
	src/qml/qml/v8/qv8valuetypewrapper.cpp
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/context2d/qquickcanvasitem.cpp
	src/quick/items/context2d/qquickcontext2d.cpp
	sync.profile
	tests/auto/qml/qjsengine/tst_qjsengine.cpp
	tests/benchmarks/qml/animation/animation.pro
	tools/qmlprofiler/qmlprofiler.pro

Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9

1 files changed, 20 insertions, 11 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index c91fc06c22..022083c596 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qqmltypeloader_p.h"
+#include "qqmlabstracturlinterceptor_p.h"
 
 #include <private/qqmlengine_p.h>
 #include <private/qqmlglobal_p.h>
@@ -250,6 +251,23 @@ QQmlDataBlob::~QQmlDataBlob()
 }
 
 /*!
+  Sets the manager, and does stuff like selection which needs access to the manager.
+  Must be called before loading can occur.
+*/
+void QQmlDataBlob::startLoading(QQmlDataLoader *manager)
+{
+    Q_ASSERT(status() == QQmlDataBlob::Null);
+    Q_ASSERT(m_manager == 0);
+    m_data.setStatus(QQmlDataBlob::Loading);
+    m_manager = manager;
+
+    //Set here because we need to get the engine from the manager
+    if (manager && manager->engine() && manager->engine()->urlInterceptor())
+        m_url = manager->engine()->urlInterceptor()->intercept(m_url,
+                    (QQmlAbstractUrlInterceptor::DataType)m_type);
+}
+
+/*!
 Returns the type provided to the constructor.
 */
 QQmlDataBlob::Type QQmlDataBlob::type() const
@@ -892,12 +910,7 @@ void QQmlDataLoader::load(QQmlDataBlob *blob, Mode mode)
     qWarning("QQmlDataLoader::load(%s): %s thread", qPrintable(blob->m_url.toString()), 
              m_thread->isThisThread()?"Compile":"Engine");
 #endif
-
-    Q_ASSERT(blob->status() == QQmlDataBlob::Null);
-    Q_ASSERT(blob->m_manager == 0);
-
-    blob->m_data.setStatus(QQmlDataBlob::Loading);
-    blob->m_manager = this;
+    blob->startLoading(this);
 
     if (m_thread->isThisThread()) {
         unlock();
@@ -930,11 +943,7 @@ void QQmlDataLoader::loadWithStaticData(QQmlDataBlob *blob, const QByteArray &da
              m_thread->isThisThread()?"Compile":"Engine");
 #endif
 
-    Q_ASSERT(blob->status() == QQmlDataBlob::Null);
-    Q_ASSERT(blob->m_manager == 0);
-    
-    blob->m_data.setStatus(QQmlDataBlob::Loading);
-    blob->m_manager = this;
+    blob->startLoading(this);
 
     if (m_thread->isThisThread()) {
         unlock();