diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
commit | 4fabebb332d8409b76e88edc74905f99119f0da4 (patch) | |
tree | 7dff5241738b7ad5f46bdbbc0c01c2955ee1d5c1 /src/qml | |
parent | 561b9323c22a594b402eac343690898d4e9c44d0 (diff) | |
parent | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quick/util/qquickimageprovider.cpp
Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
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 |