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>

3 files changed, 4 insertions, 10 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index c1206a2c..e255edd5 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -149,7 +149,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData)
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1};
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toString(QUrl::UrlFormattingOption(0x100)), -1};
     processMessage(rd);
 }
 
@@ -167,7 +167,7 @@ void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &file
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line};
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::UrlFormattingOption(0x100)), line};
     processMessage(rd);
 }
 
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index a1ef1c87..d2743374 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -400,7 +400,6 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 
                 QUrl url = QUrl(d->url);
                 int line = d->line;
-                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
 
                 d->error.setUrl(url);
                 d->error.setLine(line);
@@ -413,7 +412,6 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 
                 QUrl url = QUrl(d->url);
                 int line = d->line;
-                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
 
                 d->error.setUrl(url);
                 d->error.setLine(line);
@@ -428,7 +426,6 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 
                 QUrl url = QUrl(d->url);
                 int line = d->line;
-                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
 
                 const char *valueType = 0;
                 if (value.userType() == QVariant::Invalid) valueType = "null";
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 08cd3fe9..94b662c5 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -392,13 +392,10 @@ void QDeclarativeExpressionPrivate::exceptionToError(QScriptEngine *scriptEngine
         QScriptValue exception = scriptEngine->uncaughtException();
         QLatin1String fileNameProp("fileName");
 
-        if (!exception.property(fileNameProp).toString().isEmpty()){
+        if (!exception.property(fileNameProp).toString().isEmpty())
             fileName = exception.property(fileNameProp).toString();
-        } else {
-            fileName = QLatin1String("<Unknown File>");
-        }
 
-        error.setUrl(QUrl(fileName));
+        error.setUrl(!fileName.isEmpty() ? QUrl(fileName) : QUrl());
         error.setLine(lineNumber);
         error.setColumn(-1);
         error.setDescription(exception.toString());