diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-11-10 10:45:51 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-11-10 13:10:50 +0000 |
| commit | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (patch) | |
| tree | acbf45b8ef4d897fd4446cc9281d0be04f9cbb6b /src/qml/qml | |
| parent | 166ed1f21d7c0518350e915605869b37a4c7691b (diff) | |
Don't normalize the path via the shell if it is a qrc based path
Passing a qrc based path to shellNormalizeFileName() was causing problems
with the Windows API. Since it won't change the path in this case anyway
because the path is not valid on the file system then there is no need to
do any checking.
Task-number: QTBUG-46248
Change-Id: If20075c25aade3740287250b4e1f31538b398f8f
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 729bf8e03b..06a61c3307 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2435,6 +2435,9 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) #if defined(Q_OS_MAC) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT) const QString canonical = info.canonicalFilePath(); #elif defined(Q_OS_WIN) + // No difference if the path is qrc based + if (absolute[0] == QLatin1Char(':')) + return true; const QString canonical = shellNormalizeFileName(absolute); #endif |