From aad255f6d5e79f496e93c9e758504a1d2c8a2467 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 11 Jul 2014 16:15:01 +0200 Subject: QQmlError::toString: improve handling of empty urls. "file::2:23: ..." is strange to read. Show ":2:23: ..." instead, by treating empty urls (including "file:") as unknown, and by still showing line and column numbers in such a case. This change makes it possible for QUrl::fromLocalFile("") to return an empty url rather than "file:", which this module was relying upon in the tests. Change-Id: I91918090fd4e0aa9a25dbbb18893a0ce94140e21 Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlerror.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/qml/qml/qqmlerror.cpp') diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index c583156c43..6d72bfcffa 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -249,16 +249,17 @@ QString QQmlError::toString() const QUrl u(url()); int l(line()); - if (u.isEmpty()) { + if (u.isEmpty() || (u.isLocalFile() && u.path().isEmpty())) rv = QLatin1String(""); - } else if (l != -1) { - rv = u.toString() + QLatin1Char(':') + QString::number(l); + else + rv = u.toString(); + + if (l != -1) { + rv += QLatin1Char(':') + QString::number(l); int c(column()); if (c != -1) rv += QLatin1Char(':') + QString::number(c); - } else { - rv = u.toString(); } rv += QLatin1String(": ") + description(); -- cgit v1.2.3