Compilation fix (cannot assign const pointer to non-const pointer)
authorBradley T. Hughes <bradley.hughes@nokia.com>
Thu, 27 Oct 2011 11:47:31 +0000 (13:47 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 27 Oct 2011 12:56:14 +0000 (14:56 +0200)
After reinterpret_casting to const NSString *, we need to const_cast to
drop the cast to match the return type.

Change-Id: I3d202aec10e719a48f29d96b81621492936ac6ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h

index b46946c..c85d390 100644 (file)
@@ -214,7 +214,7 @@ inline QString qt_mac_NSStringToQString(const NSString *nsstr)
 { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
 
 inline NSString *qt_mac_QStringToNSString(const QString &qstr)
-{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
+{ return [const_cast<NSString *>(reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr))) autorelease]; }
 
 #endif