diff options
| author | Jari Karppinen <jari.karppinen@qt.io> | 2019-06-04 14:55:22 +0300 |
|---|---|---|
| committer | Jari Karppinen <jari.karppinen@qt.io> | 2019-06-05 14:36:03 +0300 |
| commit | 724583009943984273df90ccbfcb5a7373603f45 (patch) | |
| tree | 16ec97d473f39c2a32767fe93df73c0130e1f70e | |
| parent | 059007c11ca4ed8ed60ab6f9d203e9d81f3e3379 (diff) | |
Force path normalization to use forward slashes
Task-number: QT3DS-3620
Change-Id: I34f30f890e5787325c592522a7d40ebc540045c1
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Runtime/ogl-runtime/src/foundation/FileTools.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Runtime/ogl-runtime/src/foundation/FileTools.cpp b/src/Runtime/ogl-runtime/src/foundation/FileTools.cpp index aa1e7384..c1733a6c 100644 --- a/src/Runtime/ogl-runtime/src/foundation/FileTools.cpp +++ b/src/Runtime/ogl-runtime/src/foundation/FileTools.cpp @@ -272,6 +272,11 @@ QString CFileTools::NormalizePathForQtUsage(const QString &path) QString filePath = QDir::cleanPath(path); + filePath.replace(QLatin1Char('\\'), QLatin1Char('/')); + + if (filePath.startsWith(QLatin1String("./"))) + return filePath.mid(2); + if (filePath.startsWith(QLatin1String("qrc:/"))) return filePath.mid(3); else |