diff options
40 files changed, 24 insertions, 258 deletions
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp index a97eaf3..7988758 100644 --- a/examples/animation/animatedtiles/main.cpp +++ b/examples/animation/animatedtiles/main.cpp @@ -40,18 +40,7 @@ ****************************************************************************/ #include <QtGui> -#ifdef QT_EXPERIMENTAL_SOLUTION -# include "qgraphicswidget.h" -# include "qstate.h" -# include "qstatemachine.h" -# include "qabstracttransition.h" -# include "qgraphicswidget.h" -# include "qparallelanimationgroup.h" -# include "qpropertyanimation.h" -# include "qsignaltransition.h" -#else #include <QtCore/qstate.h> -#endif class Pixmap : public QObject, public QGraphicsPixmapItem { diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp index 1c63aba..44457f7 100644 --- a/examples/animation/appchooser/main.cpp +++ b/examples/animation/appchooser/main.cpp @@ -41,9 +41,6 @@ #include <QtCore> #include <QtGui> -#ifdef QT_EXPERIMENTAL_SOLUTION -#include "qtgraphicswidget.h" -#endif class Pixmap : public QGraphicsWidget diff --git a/examples/animation/easing/animation.h b/examples/animation/easing/animation.h index c9472e1..d4d699d 100644 --- a/examples/animation/easing/animation.h +++ b/examples/animation/easing/animation.h @@ -44,11 +44,7 @@ #include <QtGui> -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qpropertyanimation.h" -#else -# include <QtCore/qpropertyanimation.h> -#endif +#include <QtCore/qpropertyanimation.h> class Animation : public QPropertyAnimation { public: diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp index 0ce07fc..b00485e 100644 --- a/examples/animation/moveblocks/main.cpp +++ b/examples/animation/moveblocks/main.cpp @@ -41,15 +41,6 @@ #include <QtCore> #include <QtGui> -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qstatemachine.h" -#include "qstate.h" -#include "qabstracttransition.h" -#include "qpropertyanimation.h" -#include "qsequentialanimationgroup.h" -#include "qparallelanimationgroup.h" -#include "qgraphicswidget.h" -#endif #include <time.h> class StateSwitchEvent: public QEvent diff --git a/examples/animation/padnavigator-ng/panel.h b/examples/animation/padnavigator-ng/panel.h index 35d0db5..8ad95d9 100644 --- a/examples/animation/padnavigator-ng/panel.h +++ b/examples/animation/padnavigator-ng/panel.h @@ -40,11 +40,7 @@ ****************************************************************************/ #include <QtGui/qgraphicsview.h> -#ifdef QT_EXPERIMENTAL_SOLUTION -#include "qtgraphicswidget.h" -#else #include <QtGui/qgraphicswidget.h> -#endif QT_BEGIN_NAMESPACE class Ui_BackSide; diff --git a/examples/animation/padnavigator-ng/roundrectitem.h b/examples/animation/padnavigator-ng/roundrectitem.h index fb142c6..6a7bf4b 100644 --- a/examples/animation/padnavigator-ng/roundrectitem.h +++ b/examples/animation/padnavigator-ng/roundrectitem.h @@ -41,11 +41,7 @@ #include <QtCore/qobject.h> #include <QtGui/qbrush.h> -#ifdef QT_EXPERIMENTAL_SOLUTION -#include "qtgraphicswidget.h" -#else #include <QtGui/qgraphicswidget.h> -#endif QT_BEGIN_NAMESPACE class QGraphicsProxyWidget; diff --git a/examples/animation/padnavigator-ng/splashitem.h b/examples/animation/padnavigator-ng/splashitem.h index 05ff040..7b4b8a9 100644 --- a/examples/animation/padnavigator-ng/splashitem.h +++ b/examples/animation/padnavigator-ng/splashitem.h @@ -40,11 +40,7 @@ ****************************************************************************/ #include <QtCore/qobject.h> -#ifdef QT_EXPERIMENTAL_SOLUTION -#include "qtgraphicswidget.h" -#else #include <QtGui/qgraphicswidget.h> -#endif class SplashItem : public QGraphicsWidget { diff --git a/examples/animation/research/memberfunctions/qvalueanimation.h b/examples/animation/research/memberfunctions/qvalueanimation.h index 55c4993..17e9817 100644 --- a/examples/animation/research/memberfunctions/qvalueanimation.h +++ b/examples/animation/research/memberfunctions/qvalueanimation.h @@ -42,11 +42,7 @@ #ifndef QVALUEANIMATION_H #define QVALUEANIMATION_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qvariantanimation.h" -#else -# include <QtCore/qvariantanimation.h> -#endif +#include <QtCore/qvariantanimation.h> QT_BEGIN_HEADER diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp index 06b0667..17a7a8e 100644 --- a/examples/animation/states/main.cpp +++ b/examples/animation/states/main.cpp @@ -40,14 +40,6 @@ ****************************************************************************/ #include <QtGui> -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qstate.h" -# include "qstatemachine.h" -# include "qtransition.h" -# include "qparallelanimationgroup.h" -# include "qsequentialanimationgroup.h" -# include "qpropertyanimation.h" -#endif class Pixmap : public QGraphicsWidget { diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp index 1feb31d..eb4ed11 100644 --- a/examples/animation/stickman/lifecycle.cpp +++ b/examples/animation/stickman/lifecycle.cpp @@ -47,15 +47,6 @@ #include <QtCore> #include <QtGui> -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qstatemachine.h" -#include "qstate.h" -#include "qeventtransition.h" -#include "qsignaltransition.h" -#include "qsignalevent.h" -#include "qpropertyanimation.h" -#include "qparallelanimationgroup.h" -#endif class KeyPressTransition: public QSignalTransition { diff --git a/examples/animation/sub-attaq/animationmanager.cpp b/examples/animation/sub-attaq/animationmanager.cpp index 5b9282a..477d3bd 100644 --- a/examples/animation/sub-attaq/animationmanager.cpp +++ b/examples/animation/sub-attaq/animationmanager.cpp @@ -43,11 +43,7 @@ #include "animationmanager.h" //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qabstractanimation.h" -#else -# include <QtCore/QAbstractAnimation> -#endif +#include <QtCore/QAbstractAnimation> #include <QtCore/QDebug> // the universe's only animation manager diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp index 143cf94..63d12bb 100644 --- a/examples/animation/sub-attaq/boat.cpp +++ b/examples/animation/sub-attaq/boat.cpp @@ -50,22 +50,12 @@ #include "qanimationstate.h" //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qpropertyanimation.h" -# include "qstatemachine.h" -# include "qhistorystate.h" -# include "qfinalstate.h" -# include "qstate.h" -# include "qpauseanimation.h" -#include "qsequentialanimationgroup.h" -#else #include <QtCore/QPropertyAnimation> #include <QtCore/QStateMachine> #include <QtCore/QHistoryState> #include <QtCore/QFinalState> #include <QtCore/QState> #include <QtCore/QSequentialAnimationGroup> -#endif static QAbstractAnimation *setupDestroyAnimation(Boat *boat) { diff --git a/examples/animation/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h index b28cf20..f16074e 100644 --- a/examples/animation/sub-attaq/boat.h +++ b/examples/animation/sub-attaq/boat.h @@ -46,11 +46,7 @@ #include <QtCore/QObject> #include <QtGui/QKeyEvent> -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qtgraphicswidget.h" -#else -# include <QtGui/QGraphicsWidget> -#endif +#include <QtGui/QGraphicsWidget> class PixmapItem; class Bomb; diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h index 6f03e48..c934bc5 100644 --- a/examples/animation/sub-attaq/boat_p.h +++ b/examples/animation/sub-attaq/boat_p.h @@ -47,11 +47,7 @@ #include "graphicsscene.h" // Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qkeyeventtransition.h" -#else -# include <QtGui/QKeyEventTransition> -#endif +#include <QtGui/QKeyEventTransition> static const int MAX_BOMB = 5; diff --git a/examples/animation/sub-attaq/bomb.cpp b/examples/animation/sub-attaq/bomb.cpp index 04310aa..f1f5324 100644 --- a/examples/animation/sub-attaq/bomb.cpp +++ b/examples/animation/sub-attaq/bomb.cpp @@ -47,18 +47,10 @@ #include "qanimationstate.h" //Qt - -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qpropertyanimation.h" -#include "qsequentialanimationgroup.h" -#include "qstatemachine.h" -#include "qfinalstate.h" -#else #include <QtCore/QSequentialAnimationGroup> #include <QtCore/QPropertyAnimation> #include <QtCore/QStateMachine> #include <QtCore/QFinalState> -#endif Bomb::Bomb(QGraphicsItem * parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags), launchAnimation(0) diff --git a/examples/animation/sub-attaq/bomb.h b/examples/animation/sub-attaq/bomb.h index 9191e6e..226d056 100644 --- a/examples/animation/sub-attaq/bomb.h +++ b/examples/animation/sub-attaq/bomb.h @@ -43,13 +43,8 @@ #define __BOMB__H__ //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qanimationgroup.h" -# include "qgraphicswidget.h" -#else -# include <QtGui/QGraphicsWidget> -# include <QtCore/QAnimationGroup> -#endif +#include <QtGui/QGraphicsWidget> +#include <QtCore/QAnimationGroup> class PixmapItem; diff --git a/examples/animation/sub-attaq/custompropertyanimation.h b/examples/animation/sub-attaq/custompropertyanimation.h index 48a50c9..1dca454 100644 --- a/examples/animation/sub-attaq/custompropertyanimation.h +++ b/examples/animation/sub-attaq/custompropertyanimation.h @@ -42,11 +42,7 @@ #ifndef CUSTOMPROPERTYANIMATION_H #define CUSTOMPROPERTYANIMATION_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qvariantanimation.h" -#else -# include <QtCore/qvariantanimation.h> -#endif +#include <QtCore/qvariantanimation.h> class QGraphicsItem; diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp index 2a6f83c..f2d41bc 100644 --- a/examples/animation/sub-attaq/graphicsscene.cpp +++ b/examples/animation/sub-attaq/graphicsscene.cpp @@ -53,21 +53,12 @@ #include "progressitem.h" //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qpropertyanimation.h" -#include "qsequentialanimationgroup.h" -#include "qparallelanimationgroup.h" -#include "qstatemachine.h" -#include "qfinalstate.h" -#include "qpauseanimation.h" -#else #include <QtCore/QPropertyAnimation> #include <QtCore/QSequentialAnimationGroup> #include <QtCore/QParallelAnimationGroup> #include <QtCore/QStateMachine> #include <QtCore/QFinalState> #include <QtCore/QPauseAnimation> -#endif #include <QtGui/QAction> #include <QtCore/QDir> #include <QtGui/QApplication> diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h index 0840564..70c873e 100644 --- a/examples/animation/sub-attaq/graphicsscene.h +++ b/examples/animation/sub-attaq/graphicsscene.h @@ -45,12 +45,7 @@ //Qt #include <QtGui/QGraphicsScene> #include <QtCore/QSet> - -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qstate.h" -#else -# include <QtCore/QState> -#endif +#include <QtCore/QState> class Boat; diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/examples/animation/sub-attaq/qanimationstate.cpp index 0f30ac2..26e0ef3 100644 --- a/examples/animation/sub-attaq/qanimationstate.cpp +++ b/examples/animation/sub-attaq/qanimationstate.cpp @@ -41,13 +41,8 @@ #include "qanimationstate.h" -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qstate.h" -# include "qstate_p.h" -#else -# include <QtCore/qstate.h> -# include <private/qstate_p.h> -#endif +#include <QtCore/qstate.h> +#include <private/qstate_p.h> QT_BEGIN_NAMESPACE diff --git a/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp index 7650b0f..adc8bd0 100644 --- a/examples/animation/sub-attaq/states.cpp +++ b/examples/animation/sub-attaq/states.cpp @@ -51,17 +51,10 @@ //Qt #include <QtGui/QMessageBox> #include <QtGui/QGraphicsView> -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qstatemachine.h" -#include "qkeyeventtransition.h" -#include "qsignalevent.h" -#include "qfinalstate.h" -#else #include <QtCore/QStateMachine> #include <QtGui/QKeyEventTransition> #include <QtCore/QSignalEvent> #include <QtCore/QFinalState> -#endif PlayState::PlayState(GraphicsScene *scene, QState *parent) : QState(parent), diff --git a/examples/animation/sub-attaq/states.h b/examples/animation/sub-attaq/states.h index a1cb5ff..3203b3b 100644 --- a/examples/animation/sub-attaq/states.h +++ b/examples/animation/sub-attaq/states.h @@ -43,17 +43,10 @@ #define STATES_H //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qstate.h" -#include "qsignaltransition.h" -#include "qpropertyanimation.h" -#include "qkeyeventtransition.h" -#else #include <QtCore/QState> #include <QtCore/QSignalTransition> #include <QtCore/QPropertyAnimation> -# include <QtGui/QKeyEventTransition> -#endif +#include <QtGui/QKeyEventTransition> #include <QtCore/QSet> class GraphicsScene; diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp index 0f03efc..d8cf1da 100644 --- a/examples/animation/sub-attaq/submarine.cpp +++ b/examples/animation/sub-attaq/submarine.cpp @@ -49,18 +49,10 @@ #include "custompropertyanimation.h" #include "qanimationstate.h" -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qpropertyanimation.h" -# include "qstatemachine.h" -# include "qfinalstate.h" -# include "qsequentialanimationgroup.h" -# include "qpauseanimation.h" -#else #include <QtCore/QPropertyAnimation> #include <QtCore/QStateMachine> #include <QtCore/QFinalState> #include <QtCore/QSequentialAnimationGroup> -#endif static QAbstractAnimation *setupDestroyAnimation(SubMarine *sub) { diff --git a/examples/animation/sub-attaq/submarine.h b/examples/animation/sub-attaq/submarine.h index 7ee587d..4001603 100644 --- a/examples/animation/sub-attaq/submarine.h +++ b/examples/animation/sub-attaq/submarine.h @@ -43,13 +43,8 @@ #define __SUBMARINE__H__ //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qvariantanimation.h" -#include "qgraphicswidget.h" -#else #include <QtCore/QVariantAnimation> #include <QtGui/QGraphicsWidget> -#endif class PixmapItem; diff --git a/examples/animation/sub-attaq/submarine_p.h b/examples/animation/sub-attaq/submarine_p.h index c76d991..561af4a 100644 --- a/examples/animation/sub-attaq/submarine_p.h +++ b/examples/animation/sub-attaq/submarine_p.h @@ -48,11 +48,7 @@ #include "qanimationstate.h" //Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qpropertyanimation.h" -#else #include <QtCore/QPropertyAnimation> -#endif #include <QtGui/QGraphicsScene> //This state is describing when the boat is moving right diff --git a/examples/animation/sub-attaq/torpedo.cpp b/examples/animation/sub-attaq/torpedo.cpp index 88f1112..02a54fc 100644 --- a/examples/animation/sub-attaq/torpedo.cpp +++ b/examples/animation/sub-attaq/torpedo.cpp @@ -47,15 +47,9 @@ #include "animationmanager.h" #include "qanimationstate.h" -#if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qpropertyanimation.h" -#include "qstatemachine.h" -#include "qfinalstate.h" -#else #include <QtCore/QPropertyAnimation> #include <QtCore/QStateMachine> #include <QtCore/QFinalState> -#endif Torpedo::Torpedo(QGraphicsItem * parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags), currentSpeed(0), launchAnimation(0) diff --git a/examples/animation/sub-attaq/torpedo.h b/examples/animation/sub-attaq/torpedo.h index 2e44e41..4a0f457 100644 --- a/examples/animation/sub-attaq/torpedo.h +++ b/examples/animation/sub-attaq/torpedo.h @@ -45,13 +45,8 @@ //Qt #include <QtCore/QObject> -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qvariantanimation.h" -# include "qgraphicswidget.h" -#else -# include <QtCore/QVariantAnimation> -# include <QtGui/QGraphicsWidget> -#endif +#include <QtCore/QVariantAnimation> +#include <QtGui/QGraphicsWidget> class PixmapItem; 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 diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index a7f0082..d6d50dc 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -123,10 +123,6 @@ protected: virtual void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState); virtual void updateDirection(QAbstractAnimation::Direction direction); -#ifdef QT_EXPERIMENTAL_SOLUTION - QAbstractAnimationPrivate *d_ptr; -#endif - private: Q_DISABLE_COPY(QAbstractAnimation) Q_DECLARE_PRIVATE(QAbstractAnimation) diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 41983a5..e64554c 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -56,19 +56,13 @@ #include <QtCore/qbasictimer.h> #include <QtCore/qdatetime.h> #include <QtCore/qtimer.h> -#ifndef QT_EXPERIMENTAL_SOLUTION #include <private/qobject_p.h> -#endif QT_BEGIN_NAMESPACE class QAnimationGroup; class QAbstractAnimation; -#ifdef QT_EXPERIMENTAL_SOLUTION -class QAbstractAnimationPrivate -#else class QAbstractAnimationPrivate : public QObjectPrivate -#endif { public: QAbstractAnimationPrivate() @@ -101,9 +95,6 @@ public: int currentLoop; QAnimationGroup *group; -#ifdef QT_EXPERIMENTAL_SOLUTION - QAbstractAnimation *q_ptr; -#endif private: Q_DECLARE_PUBLIC(QAbstractAnimation) diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h index 7dee070..263bc38 100644 --- a/src/corelib/animation/qanimationgroup.h +++ b/src/corelib/animation/qanimationgroup.h @@ -42,11 +42,7 @@ #ifndef QANIMATIONGROUP_H #define QANIMATIONGROUP_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qabstractanimation.h" -#else -# include <QtCore/qabstractanimation.h> -#endif +#include <QtCore/qabstractanimation.h> QT_BEGIN_HEADER diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h index 48d66a3..57a8146 100644 --- a/src/corelib/animation/qparallelanimationgroup.h +++ b/src/corelib/animation/qparallelanimationgroup.h @@ -42,11 +42,7 @@ #ifndef QPARALLELANIMATIONGROUP_H #define QPARALLELANIMATIONGROUP_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qanimationgroup.h" -#else -# include <QtCore/qanimationgroup.h> -#endif +#include <QtCore/qanimationgroup.h> QT_BEGIN_HEADER diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h index 595f2d0..cb6e041 100644 --- a/src/corelib/animation/qpauseanimation.h +++ b/src/corelib/animation/qpauseanimation.h @@ -42,11 +42,7 @@ #ifndef QPAUSEANIMATION_P_H #define QPAUSEANIMATION_P_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qanimationgroup.h" -#else -# include <QtCore/qanimationgroup.h> -#endif +#include <QtCore/qanimationgroup.h> QT_BEGIN_HEADER diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index b619256..dbd118c 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -42,11 +42,7 @@ #ifndef QPROPERTYANIMATION_H #define QPROPERTYANIMATION_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qvariantanimation.h" -#else -# include <QtCore/qvariantanimation.h> -#endif +#include <QtCore/qvariantanimation.h> QT_BEGIN_HEADER diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index 4c52d1b..4701a76 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -42,11 +42,7 @@ #ifndef QSEQUENTIALANIMATIONGROUP_H #define QSEQUENTIALANIMATIONGROUP_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qanimationgroup.h" -#else -# include <QtCore/qanimationgroup.h> -#endif +#include <QtCore/qanimationgroup.h> QT_BEGIN_HEADER diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 8ac8ca1..864575a 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -230,10 +230,7 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress) localProgress); qSwap(currentValue, ret); q->updateCurrentValue(currentValue); -#ifndef QT_EXPERIMENTAL_SOLUTION - if (connectedSignals & changedSignalMask) -#endif - if (currentValue != ret) { + if ((connectedSignals & changedSignalMask) && currentValue != ret) { //the value has changed emit q->valueChanged(currentValue); } diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index 69dbbf3..5b90930 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -42,13 +42,8 @@ #ifndef QANIMATION_H #define QANIMATION_H -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qabstractanimation.h" -# include "qeasingcurve.h" -#else -# include <QtCore/qeasingcurve.h> -# include <QtCore/qabstractanimation.h> -#endif +#include <QtCore/qeasingcurve.h> +#include <QtCore/qabstractanimation.h> #include <QtCore/qvector.h> #include <QtCore/qvariant.h> #include <QtCore/qpair.h> diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h index 8b2915b..e0b9c51 100644 --- a/src/corelib/animation/qvariantanimation_p.h +++ b/src/corelib/animation/qvariantanimation_p.h @@ -54,11 +54,7 @@ // #include "qvariantanimation.h" -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qeasingcurve.h" -#else -# include <QtCore/qeasingcurve.h> -#endif +#include <QtCore/qeasingcurve.h> #include <QtCore/qmetaobject.h> #include <QtCore/qvector.h> diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 9ef9149..23eb2a6 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -340,11 +340,7 @@ bool QEasingCurveFunction::operator==(const QEasingCurveFunction& other) _o == other._o; } -#ifdef QT_EXPERIMENTAL_SOLUTION -# include "easing.cpp" -#else -# include "../3rdparty/easing/easing.cpp" -#endif +#include "../3rdparty/easing/easing.cpp" class QEasingCurvePrivate { diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index ed18caa..37ca6a1 100644 --- a/src/gui/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp @@ -41,13 +41,8 @@ #ifndef QT_NO_ANIMATION -#ifdef QT_EXPERIMENTAL_SOLUTION -# include "qvariantanimation.h" -# include "qvariantanimation_p.h" -#else #include <QtCore/qvariantanimation.h> #include <private/qvariantanimation_p.h> -#endif #include <QtGui/qcolor.h> |