aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-07-17 07:44:46 +0000
committerSimon Hausmann <simon.hausmann@qt.io>2018-07-17 08:54:00 +0000
commit639de2678886609660a828a0fee46607c5f7dd37 (patch)
tree187257308133bd48ac4b874e52cbd183f673767f
parentd7b22cefde6cc0f38ac1dd4ee3cee107f47e9655 (diff)
Revert "[Quick] Make sure an transition instance is stopped when destroyed"
This reverts commit cf0b965aaab0ea7e777c1f8e8d35de3a73d7d08e because it causes crashes in qtquickcontrols tst_extras. Change-Id: I3809f2da84cf24b990b017a44837c02fc6c776d1 Task-number: QTBUG-69497 Task-number: QTBUG-38099 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/quick/util/qquicktransition.cpp1
-rw-r--r--tests/auto/quick/qquickanimations/data/replacingTransitions.qml51
-rw-r--r--tests/auto/quick/qquickanimations/tst_qquickanimations.cpp37
3 files changed, 0 insertions, 89 deletions
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index ad451c8f8b..c8699426f2 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -211,7 +211,6 @@ QQuickTransitionInstance::QQuickTransitionInstance(QQuickTransition *transition,
QQuickTransitionInstance::~QQuickTransitionInstance()
{
- stop();
removeStateChangeListener();
delete m_anim;
}
diff --git a/tests/auto/quick/qquickanimations/data/replacingTransitions.qml b/tests/auto/quick/qquickanimations/data/replacingTransitions.qml
deleted file mode 100644
index ff7c50cd67..0000000000
--- a/tests/auto/quick/qquickanimations/data/replacingTransitions.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-import QtQuick 2.9
-
-Rectangle {
- id: theRoot
- property alias model: theModel
- property alias addTimer: addToModel
- property alias addTransition: addTrans
- property alias displaceTransition: displaceTrans
-
- width: 400
- height: 400
-
- ListModel {
- id: theModel
- }
- Timer {
- id: addToModel
- interval: 1000
- running: false
- repeat: true
- onTriggered: {
- theModel.insert(0, {"name": "item " + theModel.count})
- if (theModel.count > 2)
- stop()
- }
- }
- Component {
- id: listDelegate
- Text {
- text: name
- }
- }
- ListView {
- id: listView
-
- property int animationDuration: 10000
-
- anchors.fill: parent
- model: theModel
- delegate: listDelegate
- add: Transition {
- id: addTrans
- NumberAnimation { properties: "x"; from: 400; duration: listView.animationDuration }
- NumberAnimation { properties: "y"; from: 400; duration: listView.animationDuration }
- }
- addDisplaced: Transition {
- id: displaceTrans
- NumberAnimation { properties: "x,y"; duration: listView.animationDuration }
- }
- }
-}
diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
index de8e30407b..de86bb16db 100644
--- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
+++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
@@ -29,8 +29,6 @@
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQuick/qquickview.h>
-#include <QtQml/private/qqmltimer_p.h>
-#include <QtQml/private/qqmllistmodel_p.h>
#include <QtQml/private/qanimationgroupjob_p.h>
#include <QtQuick/private/qquickrectangle_p.h>
#include <QtQuick/private/qquickitemanimation_p.h>
@@ -107,7 +105,6 @@ private slots:
void pathSvgAnimation();
void pathLineUnspecifiedXYBug();
void unsetAnimatorProxyJobWindow();
- void replacingTransitions();
};
#define QTIMED_COMPARE(lhs, rhs) do { \
@@ -1615,40 +1612,6 @@ void tst_qquickanimations::unsetAnimatorProxyJobWindow()
QCOMPARE(proxy.job().data(), job);
}
-void tst_qquickanimations::replacingTransitions()
-{
- QQmlEngine engine;
- QQmlComponent c(&engine, testFileUrl("replacingTransitions.qml"));
- QScopedPointer<QQuickRectangle> rect(qobject_cast<QQuickRectangle*>(c.create()));
- if (!c.errors().isEmpty())
- qDebug() << c.errorString();
- QVERIFY(rect);
-
- QQmlTimer *addTimer = rect->property("addTimer").value<QQmlTimer*>();
- QVERIFY(addTimer);
- QCOMPARE(addTimer->isRunning(), false);
-
- QQuickTransition *addTrans = rect->property("addTransition").value<QQuickTransition*>();
- QVERIFY(addTrans);
- QCOMPARE(addTrans->running(), false);
-
- QQuickTransition *displaceTrans = rect->property("displaceTransition").value<QQuickTransition*>();
- QVERIFY(displaceTrans);
- QCOMPARE(displaceTrans->running(), false);
-
- QQmlListModel *model = rect->property("model").value<QQmlListModel *>();
- QVERIFY(model);
- QCOMPARE(model->count(), 0);
-
- addTimer->start();
- QTest::qWait(1000 + 1000 + 10000);
-
- QTRY_COMPARE(addTimer->isRunning(), false);
- QTRY_COMPARE(addTrans->running(), false);
- QTRY_COMPARE(displaceTrans->running(), false);
- QCOMPARE(model->count(), 3);
-}
-
QTEST_MAIN(tst_qquickanimations)
#include "tst_qquickanimations.moc"