head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.4
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.2
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q2:1.2.0.4
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.2
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.1.0.4
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.2
	pkgsrc-2011Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2012.09.15.08.18.49;	author drochner;	state dead;
branches;
next	1.2;

1.2
date	2012.01.12.22.59.58;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2011.08.12.13.24.07;	author adam;	state Exp;
branches;
next	;


desc
@@


1.3
log
@update eo 4.8.3
changes:
-MacOS support improvements
-webkit update to 2.2.3
-bugfixes
@
text
@$NetBSD: patch-cj,v 1.2 2012/01/12 22:59:58 adam Exp $

Avoid error when compiling with Clang.

--- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig	2011-08-11 11:42:47.000000000 +0000
+++ src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@@@ -215,7 +215,7 @@@@ inline QString qt_mac_NSStringToQString(
 { 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 (NSString *)[reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
 
 #ifdef QT_MAC_USE_COCOA
 class QCocoaPostMessageArgs {
@


1.2
log
@Changes 4.8.0:
Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP
and optimized file system access.
@
text
@d1 1
a1 1
$NetBSD: patch-cj,v 1.1 2011/08/12 13:24:07 adam Exp $
@


1.1
log
@Fix building with the latest Clang
@
text
@d1 1
a1 1
$NetBSD$
d7 1
a7 1
@@@@ -195,7 +195,7 @@@@ inline QString qt_mac_NSStringToQString(
@