Make QQmlAbstractUrlInterceptor public

A supporting class for file selectors and qml import control, it allows
redirecting local file paths (use a QNAM for remote paths).

All work was done previously for Qt 5.1, including tests. This is just
making it public for Qt 5.2.

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

8 files changed, 11 insertions, 9 deletions

diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index dae76ede32..8dfe0f1d3b 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -124,7 +124,7 @@ HEADERS += \
     $$PWD/qqmlplatform_p.h \
     $$PWD/qqmlbinding_p.h \
     $$PWD/qqmlextensionplugin_p.h \
-    $$PWD/qqmlabstracturlinterceptor_p.h \
+    $$PWD/qqmlabstracturlinterceptor.h \
     $$PWD/qqmlapplicationengine_p.h \
     $$PWD/qqmlapplicationengine.h \
     $$PWD/qqmllistwrapper_p.h \
diff --git a/src/qml/qml/qqmlabstracturlinterceptor.cpp b/src/qml/qml/qqmlabstracturlinterceptor.cpp
index a68d5f7489..127dad86ce 100644
--- a/src/qml/qml/qqmlabstracturlinterceptor.cpp
+++ b/src/qml/qml/qqmlabstracturlinterceptor.cpp
@@ -44,8 +44,6 @@
  \inmodule QtQml
  \brief allows you to control QML file loading.
 
- \note This class is in an extended validation period and still subject to change. It should be treated as private API for 5.1
-
  QQmlAbstractUrlInterceptor is an interface which can be used to alter URLs
  before they are used by the QML engine. This is primarily useful for altering
  file urls into other file urls, such as selecting different graphical assets
@@ -88,4 +86,7 @@
 
  A pure virtual function where you can intercept the url. The returned value is taken as the
  new value for the url. The type of url being intercepted is given by the type variable.
+
+ Your implementation of this function must be thread-safe, as it can be called from multiple threads
+ at the same time.
 */
diff --git a/src/qml/qml/qqmlabstracturlinterceptor_p.h b/src/qml/qml/qqmlabstracturlinterceptor.h
index 186d59e301..4740b67adf 100644
--- a/src/qml/qml/qqmlabstracturlinterceptor_p.h
+++ b/src/qml/qml/qqmlabstracturlinterceptor.h
@@ -38,11 +38,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-//Private API for 5.1 (at least)
+
 #ifndef QQMLABSTRACTURLINTERCEPTOR_H
 #define QQMLABSTRACTURLINTERCEPTOR_H
 
 #include <QtCore/qurl.h>
+#include <qtqmlglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp
index 6bc9128730..8a0e015827 100644
--- a/src/qml/qml/qqmlcompiler.cpp
+++ b/src/qml/qml/qqmlcompiler.cpp
@@ -61,7 +61,7 @@
 #include "qqmlscriptstring.h"
 #include "qqmlglobal_p.h"
 #include "qqmlbinding_p.h"
-#include "qqmlabstracturlinterceptor_p.h"
+#include "qqmlabstracturlinterceptor.h"
 
 #include <QDebug>
 #include <QPointF>
diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp
index 7731935b75..78e6650d02 100644
--- a/src/qml/qml/qqmlcontext.cpp
+++ b/src/qml/qml/qqmlcontext.cpp
@@ -48,7 +48,7 @@
 #include "qqmlengine_p.h"
 #include "qqmlengine.h"
 #include "qqmlinfo.h"
-#include "qqmlabstracturlinterceptor_p.h"
+#include "qqmlabstracturlinterceptor.h"
 
 #include <qjsengine.h>
 #include <QtCore/qvarlengtharray.h>
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 5b39aba65e..81e20e269c 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -66,7 +66,7 @@
 #include <private/qv8debugservice_p.h>
 #include <private/qdebugmessageservice_p.h>
 #include "qqmlincubator.h"
-#include "qqmlabstracturlinterceptor_p.h"
+#include "qqmlabstracturlinterceptor.h"
 #include <private/qv8profilerservice_p.h>
 #include <private/qqmlboundsignal_p.h>
 
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index ffba342491..d138a232b5 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qqmltypeloader_p.h"
-#include "qqmlabstracturlinterceptor_p.h"
+#include "qqmlabstracturlinterceptor.h"
 
 #include <private/qqmlengine_p.h>
 #include <private/qqmlglobal_p.h>
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 88bca702db..9ff7ddc0eb 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -59,6 +59,7 @@
 #include <QtQml/qqmlerror.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlfile.h>
+#include <QtQml/qqmlabstracturlinterceptor.h>
 
 #include <private/qhashedstring_p.h>
 #include <private/qqmlscript_p.h>
@@ -67,7 +68,6 @@
 #include <private/qqmldirparser_p.h>
 #include <private/qqmlbundle_p.h>
 #include <private/qflagpointer_p.h>
-#include <private/qqmlabstracturlinterceptor_p.h>
 
 #include <private/qv4value_p.h>
 #include <private/qv4script_p.h>