summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation/qabstractanimation.cpp
diff options
context:
space:
mode:
authorLeonardo Sobral Cunha <leo.cunha@nokia.com>2009-05-19 15:31:47 (GMT)
committerLeonardo Sobral Cunha <leo.cunha@nokia.com>2009-05-19 16:09:24 (GMT)
commitb2302dcc101fcef3c2841e9bd47790332e1cd4c2 (patch)
tree0475e65bc31743aee29793bcf1645be76c5800bc /src/corelib/animation/qabstractanimation.cpp
parent91803020462b7e42128644bdd9ed1d3455787f79 (diff)
downloadQt-b2302dcc101fcef3c2841e9bd47790332e1cd4c2.zip
Qt-b2302dcc101fcef3c2841e9bd47790332e1cd4c2.tar.gz
Qt-b2302dcc101fcef3c2841e9bd47790332e1cd4c2.tar.bz2
Removing QT_EXPERIMENTAL_SOLUTION from the animation api
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
-rw-r--r--src/corelib/animation/qabstractanimation.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index f5b9323..759cf18 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -352,42 +352,22 @@ void QAbstractAnimationPrivate::setState(QAbstractAnimation::State newState)
\sa QVariantAnimation, QAnimationGroup
*/
-#ifdef QT_EXPERIMENTAL_SOLUTION
-QAbstractAnimation::QAbstractAnimation(QObject *parent)
- : d_ptr(new QAbstractAnimationPrivate)
-{
- // Allow auto-add on reparent
- setParent(parent);
- d_ptr->q_ptr = this;
-}
-#else
QAbstractAnimation::QAbstractAnimation(QObject *parent)
: QObject(*new QAbstractAnimationPrivate, 0)
{
// Allow auto-add on reparent
setParent(parent);
}
-#endif
/*!
\internal
*/
-#ifdef QT_EXPERIMENTAL_SOLUTION
-QAbstractAnimation::QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent)
- : d_ptr(&dd)
-{
- // Allow auto-add on reparent
- setParent(parent);
- d_ptr->q_ptr = this;
-}
-#else
QAbstractAnimation::QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent)
: QObject(dd, 0)
{
// Allow auto-add on reparent
setParent(parent);
}
-#endif
/*!
Stops the animation if it's running, then destroys the