diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-01 13:50:50 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-01 13:50:50 (GMT) |
| commit | 7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef (patch) | |
| tree | f4558113ca2723b5de3443a289b03b98a49371cf /src/gui/dialogs/qfiledialog_p.h | |
| parent | 0b3eaca3f40bde96380544f19c9b8874a60bbdeb (diff) | |
| parent | 7ab895f576b8ef8380838778958fae651a550f79 (diff) | |
| download | Qt-7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef.zip Qt-7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef.tar.gz Qt-7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/dialogs/qfiledialog_p.h')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h index 654b3bb..d798f9d 100644 --- a/src/gui/dialogs/qfiledialog_p.h +++ b/src/gui/dialogs/qfiledialog_p.h @@ -187,8 +187,7 @@ public: #ifndef Q_OS_WINCE DWORD maxLength; QString drive = path.left(3); - if (QT_WA_INLINE(::GetVolumeInformationW(reinterpret_cast<const WCHAR *>(drive.utf16()), NULL, 0, NULL, &maxLength, NULL, NULL, 0), - ::GetVolumeInformationA(drive.toLocal8Bit().constData(), NULL, 0, NULL, &maxLength, NULL, NULL, 0)) == FALSE) + if (::GetVolumeInformation(reinterpret_cast<const wchar_t *>(drive.utf16()), NULL, 0, NULL, &maxLength, NULL, NULL, 0) == FALSE) return -1; return maxLength; #else |