From 074571305e45d30066b199641eb5d0866e3b0a92 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 31 Jul 2016 21:44:09 +0200 Subject: xmlpatterns: don't use fromLocalFile() on relative paths Creating a URL like "file:fileToOpen=globals.gccxml" makes no sense, and breaks QUrl::resolved since qtbase commit 8a33077. Change-Id: Icab4fac92db2e7c3d922f548462c3345b8addd83 Reviewed-by: Thiago Macieira --- tools/xmlpatterns/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index 00d41b3..788bb02 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -213,7 +213,7 @@ static inline QUrl finalizeURI(const QApplicationArgumentParser &parser, { const QString stringURI(parser.value(arg).toString()); - if(parser.has(isURI)) + if (parser.has(isURI) || QDir::isRelativePath(stringURI)) userURI = QUrl(stringURI); else userURI = QUrl::fromLocalFile(stringURI); -- cgit v1.2.1