Merge remote branch 'qt/4.6' into qt-master-from-4.6

Conflicts:
	src/gui/kernel/qcocoapanel_mac.mm
	src/gui/kernel/qcocoasharedwindowmethods_mac_p.h

1 files changed, 2 insertions, 0 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 803bae292f..306479a741 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -193,6 +193,8 @@ sub classNames {
         push @ret, "QtConcurrentFilter"
     } elsif(basename($iheader) eq "qtconcurrentrun.h") {
         push @ret, "QtConcurrentRun"
+    } elsif(basename($iheader) eq "qaudio.h") {
+        push @ret, "QAudio"
     }
 
     my $parsable = "";