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


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

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

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

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


desc
@@


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

Avoid error when compiling with Clang.

--- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig	2011-03-02 13:32:05.000000000 +0000
+++ src/plugins/bearer/corewlan/qcorewlanengine.mm
@@@@ -73,7 +73,7 @@@@ inline QString qt_NSStringToQString(cons
 { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
 
 inline NSString *qt_QStringToNSString(const QString &qstr)
-{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
+{ return (NSString *)[reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
 
 
 @@interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject
@


1.3
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-ci,v 1.2 2011/08/12 13:24:07 adam Exp $
@


1.2
log
@Fix building with the latest Clang
@
text
@d1 1
a1 1
$NetBSD: patch-ci,v 1.1 2011/03/03 05:50:04 adam Exp $
d3 1
a3 1
Rename argument 'id'; 'id' is a key-word in Objective-C.
a15 18
@@@@ -864,7 +864,7 @@@@ quint64 QCoreWlanEngine::bytesReceived(c
     return getBytes(interfaceStr,true);
 }
 
-quint64 QCoreWlanEngine::startTime(const QString &id)
+quint64 QCoreWlanEngine::startTime(const QString &qid)
 {
     QMutexLocker locker(&mutex);
     NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
@@@@ -899,7 +899,7 @@@@ quint64 QCoreWlanEngine::startTime(const
                 for(int i = 0; i < dictSize; i++) {
                     if([ssidStr isEqualToString:keys[i]]) {
                         const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_NSStringToQString(objects[i])));
-                        if(ident == id) {
+                        if(ident == qid) {
                             ok = true;
                         }
                     }
@


1.1
log
@Changes 4.7.2:
This is a maintenance release which contains bug-fixes based on feedback and
contributions since the Qt 4.7.1 release back in November.  It also marks the
official release of Qt Quick.

Qt Quick is a new feature within Qt that makes it easy to create light-weight
apps and UIs. It contains the new QML language, the Qt Declarative module, and
new tooling in Qt Creator to easily build apps.

PkgSrc: now builds with Clang.
@
text
@d1 1
a1 1
$NetBSD$
d7 9
@