diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
tree | 598d682291945055e4f6feb08a228212648482c1 /src/widgets/animation | |
parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/widgets/animation')
-rw-r--r-- | src/widgets/animation/animation.pri | 3 | ||||
-rw-r--r-- | src/widgets/animation/qguivariantanimation.cpp | 95 |
2 files changed, 0 insertions, 98 deletions
diff --git a/src/widgets/animation/animation.pri b/src/widgets/animation/animation.pri deleted file mode 100644 index 27763ca003..0000000000 --- a/src/widgets/animation/animation.pri +++ /dev/null @@ -1,3 +0,0 @@ -# Qt gui animation module - -SOURCES += animation/qguivariantanimation.cpp diff --git a/src/widgets/animation/qguivariantanimation.cpp b/src/widgets/animation/qguivariantanimation.cpp deleted file mode 100644 index c344a18b8a..0000000000 --- a/src/widgets/animation/qguivariantanimation.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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.1, 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include <QtCore/qvariantanimation.h> -#include <private/qvariantanimation_p.h> - -#ifndef QT_NO_ANIMATION - -#include <QtGui/qcolor.h> -#include <QtGui/qvector2d.h> -#include <QtGui/qvector3d.h> -#include <QtGui/qvector4d.h> -#include <QtGui/qquaternion.h> - -QT_BEGIN_NAMESPACE - -template<> Q_INLINE_TEMPLATE QColor _q_interpolate(const QColor &f,const QColor &t, qreal progress) -{ - return QColor(qBound(0,_q_interpolate(f.red(), t.red(), progress),255), - qBound(0,_q_interpolate(f.green(), t.green(), progress),255), - qBound(0,_q_interpolate(f.blue(), t.blue(), progress),255), - qBound(0,_q_interpolate(f.alpha(), t.alpha(), progress),255)); -} - -template<> Q_INLINE_TEMPLATE QQuaternion _q_interpolate(const QQuaternion &f,const QQuaternion &t, qreal progress) -{ - return QQuaternion::slerp(f, t, progress); -} - -static void qRegisterGuiGetInterpolator() -{ - qRegisterAnimationInterpolator<QColor>(_q_interpolateVariant<QColor>); - qRegisterAnimationInterpolator<QVector2D>(_q_interpolateVariant<QVector2D>); - qRegisterAnimationInterpolator<QVector3D>(_q_interpolateVariant<QVector3D>); - qRegisterAnimationInterpolator<QVector4D>(_q_interpolateVariant<QVector4D>); - qRegisterAnimationInterpolator<QQuaternion>(_q_interpolateVariant<QQuaternion>); -} -Q_CONSTRUCTOR_FUNCTION(qRegisterGuiGetInterpolator) - -static void qUnregisterGuiGetInterpolator() -{ - // casts required by Sun CC 5.5 - qRegisterAnimationInterpolator<QColor>( - (QVariant (*)(const QColor &, const QColor &, qreal))0); - qRegisterAnimationInterpolator<QVector2D>( - (QVariant (*)(const QVector2D &, const QVector2D &, qreal))0); - qRegisterAnimationInterpolator<QVector3D>( - (QVariant (*)(const QVector3D &, const QVector3D &, qreal))0); - qRegisterAnimationInterpolator<QVector4D>( - (QVariant (*)(const QVector4D &, const QVector4D &, qreal))0); - qRegisterAnimationInterpolator<QQuaternion>( - (QVariant (*)(const QQuaternion &, const QQuaternion &, qreal))0); -} -Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator) - -QT_END_NAMESPACE - -#endif //QT_NO_ANIMATION |