Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	mkspecs/features/qt.prf
	src/corelib/animation/qanimationgroup.cpp
	src/corelib/animation/qparallelanimationgroup.cpp
	src/corelib/animation/qpauseanimation.cpp
	src/corelib/animation/qpropertyanimation.cpp
	src/corelib/animation/qsequentialanimationgroup.cpp
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qeasingcurve.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/opengl/opengl.pro
	src/opengl/qgl_x11egl.cpp
	tests/auto/auto.pro

1 files changed, 0 insertions, 2 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 8f797e8..cd99288 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -23,7 +23,6 @@ my $basedir = $ENV{"QTDIR"};
 $basedir =~ s=\\=/=g;
 my %modules = ( # path to module name map
         "QtGui" => "$basedir/src/gui",
-        "QtAnimation" => "$basedir/src/animation",
         "QtOpenGL" => "$basedir/src/opengl",
         "QtCore" => "$basedir/src/corelib",
         "QtXml" => "$basedir/src/xml",
@@ -682,7 +681,6 @@ foreach (@modules_to_sync) {
 		    foreach(split(/ /, "$1")) {
 			$master_contents .= "#include <QtCore/QtCore>\n" if("$_" eq "core");
 			$master_contents .= "#include <QtGui/QtGui>\n" if("$_" eq "gui");
-			$master_contents .= "#include <QtAnimation/QtAnimation>\n" if("$_" eq "experimental-animation");
 			$master_contents .= "#include <QtNetwork/QtNetwork>\n" if("$_" eq "network");
 			$master_contents .= "#include <QtSvg/QtSvg>\n" if("$_" eq "svg");
 			$master_contents .= "#include <QtDeclarative/QtDeclarative>\n" if("$_" eq "declarative");