Commit 7eaba457 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Qt by Nokia
Browse files

fix abuse of QUrl c'tor


the code didn't work particularly well with absolute windows paths ...

Change-Id: Idd30cf20c24d9a3dc1aa1a173a0018f364ef1233
Reviewed-by: default avatarThiago Macieira <thiago.macieira@intel.com>
Reviewed-by: default avatarRohan McGovern <rohan.mcgovern@nokia.com>
parent 8aa3b1b3
No related merge requests found
Showing with 2 additions and 8 deletions
...@@ -83,10 +83,7 @@ int main(int argc, char **argv) ...@@ -83,10 +83,7 @@ int main(int argc, char **argv)
QUrl instanceUri; QUrl instanceUri;
{ {
QUrl url = arguments[1]; QUrl url = QUrl::fromUserInput(arguments[1]);
if (url.isRelative())
url = QUrl::fromLocalFile(arguments[1]);
if (arguments.size() == 2) { if (arguments.size() == 2) {
// either it is a schema or instance document // either it is a schema or instance document
...@@ -101,10 +98,7 @@ int main(int argc, char **argv) ...@@ -101,10 +98,7 @@ int main(int argc, char **argv)
} }
} else if (arguments.size() == 3) { } else if (arguments.size() == 3) {
instanceUri = url; instanceUri = url;
schemaUri = arguments[2]; schemaUri = QUrl::fromUserInput(arguments[2]);
if (schemaUri.isRelative())
schemaUri = QUrl::fromLocalFile(schemaUri.toString());
mode = SchemaAndInstanceMode; mode = SchemaAndInstanceMode;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment