diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2014-07-14 12:42:02 +0200 |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2014-08-06 07:21:18 +0200 |
| commit | 4124cd159e58cf806cfae7ecdadd4359eb0293de (patch) | |
| tree | 406f8e07deec1bd9288c511f9bc9245ea5010de9 /tests | |
| parent | bde755558cbe4587ed0756524ce1b97caf675d0d (diff) | |
Undo: Fix state entry bug for parallel state groups
This commit reverts c4cef6fae9f2a55f21fc9517855dfcf659c89081.
The above fix for QTBUG-25958 (cloned in QTBUG-40219) is not
complete and introduces the regression QTBUG-30049.
Task-number: QTBUG-30049, QTBUG-25958, QTBUG-40219
Change-Id: I3c4b774dce06c13cb4e089f8413a7747cedfd212
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp index 2d7beaa7c8..cfae5cdb2c 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp @@ -4704,6 +4704,9 @@ void tst_QStateMachine::propertiesAreAssignedBeforeEntryCallbacks() // QTBUG-25958 void tst_QStateMachine::multiTargetTransitionInsideParallelStateGroup() { + // TODO QTBUG-25958 was reopened, see https://codereview.qt-project.org/89775 + return; + QStateMachine machine; QState *s1 = new QState(&machine); machine.setInitialState(s1); |