diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2011-11-09 14:28:41 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 08:23:57 +0100 |
commit | 6a01c81dffe3122138bb9708166c1701059f01fa (patch) | |
tree | ac97140053d7c447d97fd611324a0ecabf474a6c /tests/auto/qtquick1/qdeclarativestates | |
parent | fbd689be06c426ba27545b3fb0f6ddd9865565d9 (diff) |
Fix crash on exit when overriding signal handlers in states.
Cherry-picked from 93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650 in 4.7.
Task-number: QTBUG-21617
Change-Id: I99ce8292d53954f5229867a384f47bedf7fad315
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativestates')
-rw-r--r-- | tests/auto/qtquick1/qdeclarativestates/data/signalOverrideCrash3.qml | 27 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp | 17 |
2 files changed, 44 insertions, 0 deletions
diff --git a/tests/auto/qtquick1/qdeclarativestates/data/signalOverrideCrash3.qml b/tests/auto/qtquick1/qdeclarativestates/data/signalOverrideCrash3.qml new file mode 100644 index 0000000000..ed1f22f39a --- /dev/null +++ b/tests/auto/qtquick1/qdeclarativestates/data/signalOverrideCrash3.qml @@ -0,0 +1,27 @@ +import QtQuick 1.0 + +Rectangle { + id: myRect + width: 400 + height: 400 + + onHeightChanged: console.log("base state") + + states: [ + State { + name: "state1" + PropertyChanges { + target: myRect + onHeightChanged: console.log("state1") + color: "green" + } + }, + State { + name: "state2"; + PropertyChanges { + target: myRect + onHeightChanged: console.log("state2") + color: "red" + } + }] +} diff --git a/tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp index 809d9ca65c..ba4177e7ff 100644 --- a/tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp @@ -108,6 +108,7 @@ private slots: void signalOverride(); void signalOverrideCrash(); void signalOverrideCrash2(); + void signalOverrideCrash3(); void parentChange(); void parentChangeErrors(); void anchorChanges(); @@ -515,6 +516,22 @@ void tst_qdeclarativestates::signalOverrideCrash2() delete rect; } +void tst_qdeclarativestates::signalOverrideCrash3() +{ + QDeclarativeEngine engine; + + QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverrideCrash3.qml"); + QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(rectComponent.create()); + QVERIFY(rect != 0); + + QDeclarativeItemPrivate::get(rect)->setState("state1"); + QDeclarativeItemPrivate::get(rect)->setState(""); + QDeclarativeItemPrivate::get(rect)->setState("state2"); + QDeclarativeItemPrivate::get(rect)->setState(""); + + delete rect; +} + void tst_qdeclarativestates::parentChange() { QDeclarativeEngine engine; |