From b734008fdbddc2c15712fff4b7bbf06407f37516 Mon Sep 17 00:00:00 2001
From: arch <ABBAPOH@nextmail.ru>
Date: Thu, 23 Feb 2012 14:52:16 +0400
Subject: Fix build for mac

Change-Id: Ifcd7f558b8ad5d7885cffdfaab7f8d3216c700c8
Reviewed-by: David Faure <faure@kde.org>
---
 src/mimetypes/inqt5/qstandardpaths_mac.cpp | 7 ++++---
 1 file 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
-- 
cgit v1.2.3