Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

2 files changed, 2 insertions, 19 deletions

diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
index 0543ff6..e2b31c7 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
+++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
@@ -1,6 +1,5 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += script
+contains(QT_CONFIG,declarative): QT += declarative script
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeworkerscript.cpp
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
index 9adbc28..fe2dac2 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
@@ -60,7 +60,6 @@ public:
     tst_QDeclarativeWorkerScript() {}
 private slots:
     void source();
-    void source_data();
     void messaging();
     void messaging_data();
     void messaging_sendQObjectList();
@@ -83,13 +82,7 @@ private:
 
 void tst_QDeclarativeWorkerScript::source()
 {
-    QFETCH(QUrl, source);
-    QFETCH(bool, valid);
-
-    if (!valid) {
-        QByteArray w = "WorkerScript: Cannot find source file \"" + source.toString().toUtf8() + "\"";
-        QTest::ignoreMessage(QtWarningMsg, w.constData());
-    }
+    QUrl source = QUrl::fromLocalFile(SRCDIR "/data/worker.qml");
 
     QDeclarativeComponent component(&m_engine);
     component.setData("import Qt 4.6\nWorkerScript { source: '" + source.toString().toUtf8() + "'; }", QUrl());
@@ -103,15 +96,6 @@ void tst_QDeclarativeWorkerScript::source()
     delete item;
 }
 
-void tst_QDeclarativeWorkerScript::source_data()
-{
-    QTest::addColumn<QUrl>("source");
-    QTest::addColumn<bool>("valid");
-
-    QTest::newRow("valid") << QUrl::fromLocalFile(SRCDIR "/data/worker.qml") << true;
-    QTest::newRow("invalid") << QUrl::fromLocalFile("asdjfk.js") << false;
-}
-
 void tst_QDeclarativeWorkerScript::messaging()
 {
     QFETCH(QVariant, value);