summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-10-13 08:50:46 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-10-13 08:51:29 (GMT)
commit0f81945563441082551c65f964531c16e185d3de (patch)
treea664751a67d8b7e44e31d0a40efec003fc0b0aef
parenta47835bf8cabffc127c2879b758f6730aca3d52b (diff)
downloadQt-0f81945563441082551c65f964531c16e185d3de.zip
Qt-0f81945563441082551c65f964531c16e185d3de.tar.gz
Qt-0f81945563441082551c65f964531c16e185d3de.tar.bz2
Fix autotest on windows
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 8e1416e..c3fdf36 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2203,7 +2203,9 @@ bool QDeclarative_isFileCaseCorrect(const QString &fileName)
#elif defined(Q_OS_WIN32)
wchar_t buffer[1024];
- DWORD rv = ::GetLongPathName((wchar_t*)absolute.utf16(), buffer, 1024);
+ DWORD rv = ::GetShortPathName((wchar_t*)absolute.utf16(), buffer, 1024);
+ if (rv == 0 || rv >= 1024) return true;
+ rv = ::GetLongPathName(buffer, buffer, 1024);
if (rv == 0 || rv >= 1024) return true;
QString canonical((QChar *)buffer);