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.


(adam)

$NetBSD: patch-cc,v 1.1 2011/03/03 05:50:04 adam Exp $

Avoid error when compiling with Clang.

--- src/gui/kernel/qwidget_mac.mm.orig	2011-01-12 10:01:28.000000000 +0000
+++ src/gui/kernel/qwidget_mac.mm
@@ -3206,7 +3206,7 @@ void QWidgetPrivate::setWindowIcon_sys(b
         if (iconButton == nil) {
             QCFString string(q->windowTitle());
             const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
-            [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:tmpString]];
+            [qt_mac_window_for(q) setRepresentedURL:[NSURL fileURLWithPath:(NSString *)tmpString]];
             iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
         }
         if (icon.isNull()) {

$NetBSD: patch-cd,v 1.1 2011/03/03 05:50:04 adam Exp $

Avoid error when compiling with Clang.

--- src/gui/kernel/qcocoaview_mac.mm.orig	2011-01-12 10:05:05.000000000 +0000
+++ src/gui/kernel/qcocoaview_mac.mm
@@ -1383,7 +1383,7 @@ static int qCocoaViewCount = 0;
     if (!selectedText.isEmpty()) {
         QCFString string(selectedText.mid(theRange.location, theRange.length));
         const NSString *tmpString = reinterpret_cast<const NSString *>((CFStringRef)string);
-        return [[[NSAttributedString alloc]  initWithString:tmpString] autorelease];
+        return [[[NSAttributedString alloc] initWithString:(NSString *)tmpString] autorelease];
     } else {
         return nil;
     }

$NetBSD: patch-ce,v 1.1 2011/03/03 05:50:04 adam Exp $

Avoid error when compiling with Clang.

--- src/gui/kernel/qcocoamenuloader_mac.mm.orig	2011-01-12 10:11:02.000000000 +0000
+++ src/gui/kernel/qcocoamenuloader_mac.mm
@@ -70,13 +70,13 @@ QT_USE_NAMESPACE
     showAllItem = [[appMenu itemWithTitle:@"Show All"] retain];
 
     // Get the names in the nib to match the app name set by Qt.
-    NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
+    const NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName()));
     [quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
-                                                                   withString:appName]];
+                                                                   withString:(NSString *)appName]];
     [hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
-                                                                   withString:appName]];
+                                                                   withString:(NSString *)appName]];
     [aboutItem setTitle:[[aboutItem title] stringByReplacingOccurrencesOfString:@"NewApplication"
-                                                                   withString:appName]];
+                                                                   withString:(NSString *)appName]];
     [appName release];
     // Disable the items that don't do anything. If someone associates a QAction with them
     // They should get synced back in.

$NetBSD: patch-cf,v 1.1 2011/03/03 05:50:04 adam Exp $

Avoid error when compiling with Clang.

--- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig	2011-01-12 10:13:43.000000000 +0000
+++ src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1333,7 +1333,7 @@ QString qt_mac_get_pasteboardString(OSPa
     if (PasteboardCopyName (paste, &pbname)) {
         pb = [NSPasteboard generalPasteboard];
     } else {
-        pb = [NSPasteboard pasteboardWithName:reinterpret_cast<const NSString *>(pbname)];
+        pb = [NSPasteboard pasteboardWithName:(NSString *)reinterpret_cast<const NSString *>(pbname)];
         CFRelease (pbname);
     }
     if (pb) {

$NetBSD: patch-cg,v 1.1 2011/03/03 05:50:04 adam Exp $

Avoid error when compiling with Clang.

--- src/gui/dialogs/qfontdialog_mac.mm.orig	2011-01-12 10:16:56.000000000 +0000
+++ src/gui/dialogs/qfontdialog_mac.mm
@@ -509,7 +509,7 @@ void QFontDialogPrivate::setFont(void *d
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     if (qstrcmp(fe->name(), "CoreText") == 0) {
-        nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
+        nsFont = (NSFont *)reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
     } else
 #endif
     {

$NetBSD: patch-ch,v 1.1 2011/03/03 05:50:04 adam Exp $

Avoid error when compiling with Clang.

--- src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h.orig	2011-03-02 12:21:02.000000000 +0000
+++ src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h
@@ -225,7 +225,7 @@ namespace WebCore {
     {
         if (!node)
             return JSC::jsNull();
-        if (JSNode* wrapper = getCachedDOMNodeWrapper(exec, node->document(), node))
+        if (JSC::JSValue wrapper = getCachedDOMNodeWrapper(exec, node->document(), node))
             return wrapper;
         return createDOMNodeWrapper<WrapperClass>(exec, globalObject, node);
     }

$NetBSD: patch-ci,v 1.1 2011/03/03 05:50:04 adam Exp $

Rename argument 'id'; 'id' is a key-word in Objective-C.

--- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig	2011-03-02 13:32:05.000000000 +0000
+++ src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -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;
                         }
                     }