diff options
| author | arch <ABBAPOH@nextmail.ru> | 2012-02-23 14:52:16 +0400 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2012-02-26 10:41:50 +0100 |
| commit | b734008fdbddc2c15712fff4b7bbf06407f37516 (patch) | |
| tree | e520c3f551dfce333862702ea94d665e174c6f35 | |
| parent | d90cb9552c5668ebc77aebb2a061b60697f8d93f (diff) | |
Fix build for mac
Change-Id: Ifcd7f558b8ad5d7885cffdfaab7f8d3216c700c8
Reviewed-by: David Faure <faure@kde.org>
| -rw-r--r-- | src/mimetypes/inqt5/qstandardpaths_mac.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mimetypes/inqt5/qstandardpaths_mac.cpp b/src/mimetypes/inqt5/qstandardpaths_mac.cpp index 9304795..00ea38f 100644 --- a/src/mimetypes/inqt5/qstandardpaths_mac.cpp +++ b/src/mimetypes/inqt5/qstandardpaths_mac.cpp @@ -43,7 +43,6 @@ #include "qstandardpaths.h" #include <qdir.h> -#include <private/qcore_mac_p.h> #include <qcoreapplication.h> #include <ApplicationServices/ApplicationServices.h> @@ -159,12 +158,14 @@ QString QStandardPaths::displayName(StandardLocation type) if (err) return QString(); - QCFString displayName; + CFStringRef displayName = 0; err = LSCopyDisplayNameForRef(&ref, &displayName); if (err) return QString(); - return static_cast<QString>(displayName); + QString result = QString::fromUtf16((ushort*)CFStringGetCharactersPtr(displayName), CFStringGetLength(displayName)); + CFRelease(displayName); + return result; } QT_END_NAMESPACE |