From 131fe1b85311b8ab02498cea5d1dda2188dcdabc Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 10 Nov 2015 10:45:51 +0100 Subject: 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 --- src/qml/qml/qqmlengine.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/qml') 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 -- cgit v1.2.3