Merge commit 'qt/master-stable'

Conflicts:
	demos/demos.pro
	src/gui/graphicsview/qgraphicsitem_p.h

1 files changed, 0 insertions, 93 deletions

diff --git a/examples/animation/sub-attaq/animationmanager.cpp b/examples/animation/sub-attaq/animationmanager.cpp
deleted file mode 100644
index 13266f9..0000000
--- a/examples/animation/sub-attaq/animationmanager.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "animationmanager.h"
-
-//Qt
-#include <QtCore/QAbstractAnimation>
-#include <QtCore/QDebug>
-
-// the universe's only animation manager
-AnimationManager *AnimationManager::instance = 0;
-
-AnimationManager::AnimationManager()
-{
-}
-
-AnimationManager *AnimationManager::self()
-{
-    if (!instance)
-        instance = new AnimationManager;
-    return instance;
-}
-
-void AnimationManager::registerAnimation(QAbstractAnimation *anim)
-{
-    animations.append(anim);
-}
-
-void AnimationManager::unregisterAnimation(QAbstractAnimation *anim)
-{
-    animations.removeAll(anim);
-}
-
-void AnimationManager::unregisterAllAnimations()
-{
-    animations.clear();
-}
-
-void AnimationManager::pauseAll()
-{
-    foreach (QAbstractAnimation* animation, animations)
-    {
-        if (animation->state() == QAbstractAnimation::Running)
-            animation->pause();
-    }
-}
-void AnimationManager::resumeAll()
-{
-    foreach (QAbstractAnimation* animation, animations)
-    {
-        if (animation->state() == QAbstractAnimation::Paused)
-            animation->resume();
-    }
-}