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

2 files changed, 0 insertions, 361 deletions

diff --git a/bin/snapshot b/bin/snapshot
deleted file mode 100644
index b9a64e1..0000000
--- a/bin/snapshot
+++ /dev/null
@@ -1,359 +0,0 @@
-#!/usr/bin/perl -w
-######################################################################
-#
-#
-######################################################################
-
-# use packages -------------------------------------------------------
-use File::Basename;
-use File::Path;
-use Cwd;
-use Config;
-use strict;
-
-my $targetPath = "";
-my $qtdir = $ENV{"QTDIR"};
-
-my @class_renames = (
-    "QAbstractAnimation",
-    "QAnimationGroup",
-    "QParallelAnimationGroup",
-    "QSequentialAnimationGroup",
-    "QEasingCurve",
-    "QVariantAnimation",
-    "QPropertyAnimation",
-    "QItemAnimation",
-    "QPauseAnimation",
-    "QAbstractState",
-    "QAbstractStateGroup",
-    "QAbstractTransition",
-    "QActionState",
-    "QEventTransition",
-    "QFinalState",
-    "QHistoryState",
-    "QParallelStateGroup",
-    "QSignalEvent",
-    "QSignalTransition",
-    "QState",
-    "QStateAction",
-    "QStateInvokeMethodAction",
-    "QStateFinishedEvent",
-    "QStateFinishedTransition",
-    "QStateMachine",
-    "QTransition",
-    "QMouseEventTransition",
-    "QBasicMouseEventTransition",
-    "QKeyEventTransition",
-    "QBasicKeyEventTransition",
-    "QGraphicsWidget",
-    "QBoundEvent");
-
-my @files = (
-            "3rdparty/easing/easing.cpp",
-            "corelib/tools/qeasingcurve.h",
-            "corelib/tools/qeasingcurve.cpp",
-            "corelib/animation/animation.pri",
-            "corelib/animation/qabstractanimation.cpp",
-            "corelib/animation/qabstractanimation.h",
-            "corelib/animation/qabstractanimation_p.h",
-            "corelib/animation/qvariantanimation.cpp",
-            "corelib/animation/qvariantanimation.h",
-            "corelib/animation/qanimationgroup.cpp",
-            "corelib/animation/qvariantanimation_p.h",
-            "corelib/animation/qanimationgroup.h",
-            "corelib/animation/qanimationgroup_p.h",
-            "corelib/animation/qparallelanimationgroup.cpp",
-            "corelib/animation/qparallelanimationgroup.h",
-            "corelib/animation/qparallelanimationgroup_p.h",
-            "corelib/animation/qpauseanimation.cpp",
-            "corelib/animation/qpauseanimation.h",
-            "corelib/animation/qpropertyanimation.cpp",
-            "corelib/animation/qpropertyanimation.h",
-            "corelib/animation/qpropertyanimation_p.h",
-            "corelib/animation/qsequentialanimationgroup.cpp",
-            "corelib/animation/qsequentialanimationgroup.h",
-            "corelib/animation/qsequentialanimationgroup_p.h",
-            "gui/animation/qguivariantanimation.cpp",
-            "gui/animation/animation.pri",
-
-            "corelib/statemachine/statemachine.pri",
-            "corelib/statemachine/qabstractstate.cpp",
-            "corelib/statemachine/qabstractstate.h",
-            "corelib/statemachine/qabstractstate_p.h",
-            "corelib/statemachine/qabstracttransition.cpp",
-            "corelib/statemachine/qabstracttransition.h",
-            "corelib/statemachine/qabstracttransition_p.h",
-            "corelib/statemachine/qactionstate.h",
-            "corelib/statemachine/qactionstate_p.h",
-            "corelib/statemachine/qactionstate.cpp",
-            "corelib/statemachine/qboundevent_p.h",
-            "corelib/statemachine/qeventtransition.cpp",
-            "corelib/statemachine/qeventtransition.h",
-            "corelib/statemachine/qeventtransition_p.h",
-            "corelib/statemachine/qfinalstate.cpp",
-            "corelib/statemachine/qfinalstate.h",
-            "corelib/statemachine/qhistorystate.cpp",
-            "corelib/statemachine/qhistorystate.h",
-            "corelib/statemachine/qhistorystate_p.h",
-            "corelib/statemachine/qsignalevent.h",
-            "corelib/statemachine/qsignaleventgenerator_p.h",
-            "corelib/statemachine/qsignaltransition.cpp",
-            "corelib/statemachine/qsignaltransition.h",
-            "corelib/statemachine/qsignaltransition_p.h",
-            "corelib/statemachine/qstate.cpp",
-            "corelib/statemachine/qstate.h",
-            "corelib/statemachine/qstateaction.cpp",
-            "corelib/statemachine/qstateaction.h",
-            "corelib/statemachine/qstateaction_p.h",
-            "corelib/statemachine/qstatefinishedevent.h",
-            "corelib/statemachine/qstatefinishedtransition.cpp",
-            "corelib/statemachine/qstatefinishedtransition.h",
-            "corelib/statemachine/qstatemachine.cpp",
-            "corelib/statemachine/qstatemachine.h",
-            "corelib/statemachine/qstatemachine_p.h",
-            "corelib/statemachine/qstate_p.h",
-            "corelib/statemachine/qactiontransition.cpp",
-            "corelib/statemachine/qactiontransition.h",
-            "corelib/statemachine/qactiontransition_p.h",
-            "gui/statemachine/qkeyeventtransition.h",
-            "gui/statemachine/qkeyeventtransition.cpp",
-            "gui/statemachine/qbasickeyeventtransition.cpp",
-            "gui/statemachine/qbasickeyeventtransition_p.h",
-            "gui/statemachine/qbasicmouseeventtransition.cpp",
-            "gui/statemachine/qbasicmouseeventtransition_p.h",
-            "gui/statemachine/qguistatemachine.cpp",
-            "gui/statemachine/qkeyeventtransition.cpp",
-            "gui/statemachine/qkeyeventtransition.h",
-            "gui/statemachine/qmouseeventtransition.cpp",
-            "gui/statemachine/qmouseeventtransition.h",
-            "gui/statemachine/statemachine.pri",       # needs special handling
-            );
-
-
-while ( @ARGV ) {
-    my $arg = shift @ARGV;
-    if ("$arg" eq "-to") {
-        $targetPath = shift @ARGV;
-    }
-}
-
-if ($targetPath eq "") {
-    die("missing -to option");
-}
-
-my $projectXML = "$targetPath\\files.xml";
-open(OXML, "> " . $projectXML) || die "Could not open $projectXML for writing (no write permission?)";
-
-print "COPYING SOURCES...\n";
-foreach my $files(@files) {
-    copyFile("$qtdir/src/$files","$targetPath/src", 1);
-}
-copyFile("$qtdir/doc/src/animation.qdoc","$targetPath/doc", 0);
-copyFile("$qtdir/doc/src/statemachine.qdoc","$targetPath/doc", 0);
-copyFile("$qtdir/src/3rdparty/easing/legal.qdoc","$targetPath/doc", 0);
-
-copyFile("$qtdir/doc/src/snippets/code/src_corelib_tools_qeasingcurve.cpp","$targetPath/doc/src/snippets/code", 0);
-
-
-my %animation_examples = (
-    easing => [ "easing.pro",
-                "main.cpp",
-                "window.cpp",
-                "window.h",
-                "animation.h",
-                "form.ui",
-                "images/qt-logo.png",
-                "resources.qrc"],
-    moveblocks => [ "moveblocks.pro",
-                    "main.cpp" ],
-    animatedtiles => [     "animatedtiles.pro",
-                    "animatedtiles.qrc",
-                    "main.cpp",
-                    "images/*"],
-    "sub-attaq" => ["sub-attaq.pro",
-                    "animationmanager.cpp",
-                    "animationmanager.h",
-                    "boat.cpp",
-                    "boat_p.h",
-                    "boat.h",
-                    "bomb.cpp",
-                    "bomb.h",
-                    "custompropertyanimation.h",
-                    "custompropertyanimation.cpp",
-                    "graphicsscene.cpp",
-                    "graphicsscene.h",
-                    "main.cpp",
-                    "mainwindow.cpp",
-                    "mainwindow.h",
-                    "pics/scalable/*",
-                    "pics/big/*.png",
-                    "pics/big/explosion/boat/*",
-                    "pics/big/explosion/submarine/*",
-                    "pics/small/*",
-                    "pics/welcome/*",
-                    "pixmapitem.cpp",
-                    "pixmapitem.h",
-                    "subattaq.qrc",
-                    "submarine.cpp",
-                    "submarine.h",
-                    "submarine_p.h",
-                    "states.cpp",
-                    "states.h",
-                    "qanimationstate.cpp",
-                    "qanimationstate.h",
-                    "torpedo.cpp",
-                    "torpedo.h",
-                    "data.xml"],
-    "stickman" => ["stickman.pro",
-                    "main.cpp",
-                    "animation.cpp",
-                    "animation.h",
-                    "graphicsview.cpp",
-                    "graphicsview.h",
-                    "lifecycle.cpp",
-                    "lifecycle.h",
-                    "node.cpp",
-                    "node.h",
-                    "stickman.cpp",
-                    "stickman.h",
-                    "editor/*",
-                    "animations/chilling",
-                    "animations/dancing",
-                    "animations/dead",
-                    "animations/jumping"]
-    );
-
-my $exDir;
-print "COPYING EXAMPLES...\n";
-for $exDir ( keys %animation_examples ) {
-    print "  $exDir...\n";
-    my $i = 0;
-    for $i ( 0 .. $#{ $animation_examples{$exDir} } ) {
-        my $ex_file = $animation_examples{$exDir}[$i];
-
-        my $copyTargetPath;
-        my $glob = 0;
-        if (index($ex_file,"/") > 0) {
-            my($basefile, $fullPath) = fileparse("$targetPath/examples/$exDir/$ex_file");
-            if (index($basefile, "*") >= 0) {
-                $glob = 1;
-            }
-            mkpath "$fullPath",  0777 unless(-e "$fullPath");
-            $copyTargetPath = "$fullPath";
-        } else {
-            $copyTargetPath = "$targetPath/examples/$exDir";
-        }
-        my $lastCh = substr($copyTargetPath, length($copyTargetPath) - 1, 1);
-        if ($lastCh eq "/" || $lastCh eq "\\") {
-            chop($copyTargetPath);
-        }
-
-        if ($glob eq 1) {
-            my @globFiles = < $qtdir/examples/animation/$exDir/$ex_file >;
-            foreach my $globFile(@globFiles) {
-                copyFile("$globFile", "$copyTargetPath", 0);
-            }
-        } else {
-            copyFile("$qtdir/examples/animation/$exDir/$ex_file", "$copyTargetPath", 0);
-        }
-    }
-}
-
-close OXML;
-print("Finished!");
-
-
-######################################################################
-# Syntax:  copyFile(gitfile, destinationPath)
-# Params:  gitfile, string, filename to create duplicate for
-#          destinationPath, string, destination name of duplicate
-#          autoRename, int, 0: Don't rename
-#                           1: The file should be renamed to have the "qt" prefix
-#
-#
-# Purpose: Copies to the solutions area.
-# Returns: --
-# Warning: Dies if script cannot get write access.
-######################################################################
-sub copyFile
-{
-    my ($gitfile, $destinationPath, $autoRename) = @_;
-    # Bi-directional synchronization
-    open( I, "< " . $gitfile ) || die "Could not open $gitfile for reading";
-    local $/;
-    binmode I;
-    my $filecontents = <I>;
-    my ($baseFileName, $path, $ext) = fileparse($gitfile, qr/\.[^.]*/);
-    if ($ext eq ".h"  or $ext eq ".cpp" or $ext eq ".qdoc") {
-        # both public and private classes
-        foreach my $qtClass(@class_renames) {
-            my $solutionClass = $qtClass;
-            $solutionClass =~s/^Q/Qt/g;
-            $filecontents =~s/$qtClass/$solutionClass/g;
-            my $qtFilename = lc($qtClass);
-            my $solutionFilename = lc($solutionClass);
-            $filecontents =~s/(#\s*include\s+["])$qtFilename/${1}$solutionFilename/g;
-        }
-
-        $filecontents =~s/Q_CORE_EXPORT/Q_ANIMATION_EXPORT/g;
-        $filecontents =~s/Q_GUI_EXPORT/Q_ANIMATION_EXPORT/g;
-        $filecontents =~s/class Q_GUI_EXPORT/class/g;
-        $filecontents =~s/class Q_AUTOTEST_EXPORT/class/g;
-
-        # moc stuff
-        $filecontents =~s/(#\s*include\s+["])moc_q/${1}moc_qt/g;
-
-        $filecontents =~s/\\since 4\.[0-9]//g;
-        $filecontents =~s/\\ingroup [a-z]+//g;
-
-        if (substr($filecontents, 0, 10) eq "/*********") {
-            my $endOfComment = index($filecontents, "*/");
-            $filecontents = substr($filecontents, $endOfComment + 2);
-        }
-    }
-    if ($ext eq ".pri"  ) {
-        $filecontents =~s/\$\$PWD\/q/\$\$PWD\/qt/g;
-        $filecontents =~s/animation\/q/\$\$PWD\/qt/g;
-
-        # oooh such a hack this is
-        if ($baseFileName eq "statemachine") {
-            if (index($gitfile, "corelib/statemachine") >= 0) {
-                $baseFileName = "corelib_statemachine";
-            }
-            if (index($gitfile, "gui/statemachine") >= 0) {
-                $baseFileName = "gui_statemachine";
-            }
-        }
-        if ($baseFileName eq "animation") {
-            if (index($gitfile, "corelib/animation") >= 0) {
-                $baseFileName = "corelib_animation";
-            }
-            if (index($gitfile, "gui/animation") >= 0) {
-                $baseFileName = "gui_animation";
-            }
-        }
-
-    }
-
-    if ($ext eq ".pro") {
-        $filecontents = "$filecontents\ninclude(../../src/qtanimationframework.pri)\n";
-    }
-    close I;
-
-    mkpath $destinationPath, 0777 unless(-e "$destinationPath");
-
-    if ($autoRename eq 1 and ($ext eq ".h"  or $ext eq ".cpp" or $ext eq ".qdoc")) {
-        $baseFileName =~s/^q/qt/g;
-    }
-    my $targetFile = "$destinationPath/$baseFileName$ext";
-    open(O, "> " . $targetFile) || die "Could not open $targetFile for writing (no write permission?)";
-    local $/;
-    binmode O;
-    print O $filecontents;
-    close O;
-
-    my $xmlEntry = substr($targetFile, length($targetPath) + 1);
-    print "$xmlEntry\n";
-    print OXML "<add>$xmlEntry</add>\n";
-}
-
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");