Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	bin/syncqt
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
	src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
	src/3rdparty/webkit/WebCore/page/FrameView.cpp
	src/3rdparty/webkit/WebCore/page/FrameView.h
	src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
	src/3rdparty/webkit/WebCore/platform/ScrollView.h
	src/corelib/plugin/quuid.cpp
	src/gui/dialogs/qfontdialog.cpp
	src/multimedia/audio/qaudiodevicefactory.cpp
	src/opengl/qgl.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/qxmlquery/tst_qxmlquery.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 11b1d72..12c431d 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -42,7 +42,7 @@ my %modules = ( # path to module name map
         "QtScript" => "$basedir/src/script",
         "QtScriptTools" => "$basedir/src/scripttools",
         "Qt3Support" => "$basedir/src/qt3support",
-        "ActiveQt" => "$basedir/src/activeqt/container;$basedir/src/activeqt/control;$basedir/src/activeqt/shared",
+        "ActiveQt" => "$basedir/src/activeqt",
         "QtTest" => "$basedir/src/testlib",
         "QtHelp" => "$basedir/tools/assistant/lib",
         "QtDesigner" => "$basedir/tools/designer/src/lib",
@@ -991,7 +991,7 @@ if($check_includes) {
         #iteration info
         my $lib = $_;
         my $dir = "$modules{$lib}";
-        foreach (split(/;/, $dir)) {
+	{
             my $current_dir = "$_";
             #calc subdirs
             my @subdirs = ($current_dir);