Fix compilation and tests after qtbase/api_changes merge

Adapt to QUrl changes, based on how qtdeclarative was adapted in
commit 2d393ae042d5badf0862c0f95122f9662042f2a9.

Change-Id: I9d1fddf4bbc6d86ac206dca4ac929d180ec12efa
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index 15bede84..1c08546a 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -342,7 +342,7 @@ void tst_qdeclarativecontext::setContextProperty()
         QDeclarativeContext ctxt(engine.rootContext());
         ctxt.setContextProperty("ctxtProp", QVariant());
 
-        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:1: TypeError: Result of expression 'ctxtProp' [undefined] is not an object.");
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: TypeError: Result of expression 'ctxtProp' [undefined] is not an object.");
         QObject *obj = component.create(&ctxt);
 
         QVariant v = obj->property("obj");
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
index 586f5da7..77286559 100644
--- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -271,7 +271,7 @@ void tst_qdeclarativeengine::outputWarningsToStandardError()
     delete o;
 
     QCOMPARE(warnings.count(), 1);
-    QCOMPARE(warnings.at(0), QLatin1String("<Unknown File>:1: Unable to assign [undefined] to int a"));
+    QCOMPARE(warnings.at(0), QLatin1String("<Unknown File>: Unable to assign [undefined] to int a"));
     warnings.clear();
 
 
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 5aaea511..fe152442 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -2420,19 +2420,19 @@ void tst_qdeclarativetextedit::testQtQuick11Attributes_data()
     QTest::addColumn<QString>("error");
 
     QTest::newRow("canPaste") << "property bool foo: canPaste"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: canPaste"
+        << "<Unknown File>: ReferenceError: Can't find variable: canPaste"
         << "";
 
     QTest::newRow("lineCount") << "property int foo: lineCount"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: lineCount"
+        << "<Unknown File>: ReferenceError: Can't find variable: lineCount"
         << "";
 
     QTest::newRow("moveCursorSelection") << "Component.onCompleted: moveCursorSelection(0, TextEdit.SelectCharacters)"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: moveCursorSelection"
+        << "<Unknown File>: ReferenceError: Can't find variable: moveCursorSelection"
         << "";
 
     QTest::newRow("deselect") << "Component.onCompleted: deselect()"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: deselect"
+        << "<Unknown File>: ReferenceError: Can't find variable: deselect"
         << "";
 
     QTest::newRow("onLinkActivated") << "onLinkActivated: {}"
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index e72bbd47..1769345f 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -2426,15 +2426,15 @@ void tst_qdeclarativetextinput::testQtQuick11Attributes_data()
     QTest::addColumn<QString>("error");
 
     QTest::newRow("canPaste") << "property bool foo: canPaste"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: canPaste"
+        << "<Unknown File>: ReferenceError: Can't find variable: canPaste"
         << "";
 
     QTest::newRow("moveCursorSelection") << "Component.onCompleted: moveCursorSelection(0, TextEdit.SelectCharacters)"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: moveCursorSelection"
+        << "<Unknown File>: ReferenceError: Can't find variable: moveCursorSelection"
         << "";
 
     QTest::newRow("deselect") << "Component.onCompleted: deselect()"
-        << "<Unknown File>:1: ReferenceError: Can't find variable: deselect"
+        << "<Unknown File>: ReferenceError: Can't find variable: deselect"
         << "";
 }