Polish up QQmlFileSelector

Incorporate beta feedback, and hide QQmlAbstractUrlInterceptor as the
implementation (instead of making that "the API").

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

2 files changed, 20 insertions, 9 deletions

diff --git a/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp b/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp
index a583fd0c4c..a9c1c11549 100644
--- a/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp
+++ b/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp
@@ -43,6 +43,7 @@
 #include <QQmlEngine>
 #include <QQmlComponent>
 #include <QQmlFileSelector>
+#include <QQmlApplicationEngine>
 #include <QFileSelector>
 #include <QQmlContext>
 #include <qqmlinfo.h>
@@ -56,17 +57,30 @@ public:
 
 private slots:
     void basicTest();
+    void applicationEngineTest();
 
 };
 
 void tst_qqmlfileselector::basicTest()
 {
     QQmlEngine engine;
-    QFileSelector selector;
+    QQmlFileSelector selector(&engine);
     selector.setExtraSelectors(QStringList() << "basic");
-    QQmlFileSelector qmlSelector;
-    qmlSelector.setSelector(&selector);
-    engine.setUrlInterceptor(&qmlSelector);
+
+    QQmlComponent component(&engine, testFileUrl("basicTest.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("value").toString(), QString("selected"));
+
+    delete object;
+}
+
+void tst_qqmlfileselector::applicationEngineTest()
+{
+    QQmlApplicationEngine engine;
+    QQmlFileSelector* selector = QQmlFileSelector::get(&engine);
+    QVERIFY(selector != 0);
+    selector->setExtraSelectors(QStringList() << "basic");
 
     QQmlComponent component(&engine, testFileUrl("basicTest.qml"));
     QObject *object = component.create();
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index f889036961..621061ab6a 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -3511,12 +3511,9 @@ void tst_qqmllanguage::compositeSingletonJavaScriptPragma()
 // Reads values from a Singleton accessed through selectors.
 void tst_qqmllanguage::compositeSingletonSelectors()
 {
-    QFileSelector selector;
-    selector.setExtraSelectors(QStringList() << "basicSelector");
-    QQmlFileSelector qmlSelector;
-    qmlSelector.setSelector(&selector);
     QQmlEngine e2;
-    e2.setUrlInterceptor(&qmlSelector);
+    QQmlFileSelector qmlSelector(&e2);
+    qmlSelector.setExtraSelectors(QStringList() << "basicSelector");
     QQmlComponent component(&e2, testFile("singletonTest1.qml"));
     VERIFY_ERRORS(0);
     QObject *o = component.create();