diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2016-07-22 23:25:14 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-07-23 17:05:09 +0000 |
commit | e90625f00a3727ca1c89a94407b7686327d03c19 (patch) | |
tree | d2161b41a0641780ba24a24cb9aa61672036a642 | |
parent | ed05a82cd52d2f84647ad1d46b242c619b2a14e3 (diff) |
Work around ICC bug about C++11 noexcept inheritance
qquickitemanimation.cpp(213): error #809: exception specification for virtual function "QQuickParentAnimationData::~QQuickParentAnimationData" is incompatible with that of overridden function "QAbstractAnimationAction::~QAbstractAnimationAction"
Change-Id: I149e0540c00745fe8119fffd1463cb59e590b6b8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 33ebc4d4..44b5938f 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -2595,33 +2595,33 @@ QPointF QDeclarativeParentAnimationPrivate::computeTransformOrigin(QDeclarativeI } } +struct QDeclarativeParentAnimationData : public QAbstractAnimationAction +{ + QDeclarativeParentAnimationData() {} + ~QDeclarativeParentAnimationData() { qDeleteAll(pc); } + + QDeclarativeStateActions actions; + //### reverse should probably apply on a per-action basis + bool reverse; + QList<QDeclarativeParentChange *> pc; + virtual void doAction() + { + for (int ii = 0; ii < actions.count(); ++ii) { + const QDeclarativeAction &action = actions.at(ii); + if (reverse) + action.event->reverse(); + else + action.event->execute(); + } + } +}; + void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, TransitionDirection direction) { Q_D(QDeclarativeParentAnimation); - struct QDeclarativeParentAnimationData : public QAbstractAnimationAction - { - QDeclarativeParentAnimationData() {} - ~QDeclarativeParentAnimationData() { qDeleteAll(pc); } - - QDeclarativeStateActions actions; - //### reverse should probably apply on a per-action basis - bool reverse; - QList<QDeclarativeParentChange *> pc; - virtual void doAction() - { - for (int ii = 0; ii < actions.count(); ++ii) { - const QDeclarativeAction &action = actions.at(ii); - if (reverse) - action.event->reverse(); - else - action.event->execute(); - } - } - }; - QDeclarativeParentAnimationData *data = new QDeclarativeParentAnimationData; QDeclarativeParentAnimationData *viaData = new QDeclarativeParentAnimationData; |