diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-20 13:51:53 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-20 13:51:53 +0000 |
commit | a99eb61b18f243933ec5ed029fbd56a26b118dc4 (patch) | |
tree | 38c8a32ffc1036b1faea8422c71bec569e17e5d5 /src/qml | |
parent | 7f1a13ebbb28db7d2a2694967185c4b80dd31f0d (diff) | |
parent | 4fabebb332d8409b76e88edc74905f99119f0da4 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/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 adb0b81d45..93e66a1b12 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2392,6 +2392,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 |