diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-07 08:31:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-07 09:38:34 +0000 |
| commit | 191a21047863cd327d3e8102b08dbf20a4c6e0a5 (patch) | |
| tree | 9be92e3111992951d87571ebbcf1e2859901050f /src/corelib/statemachine/qstatemachine.cpp | |
| parent | dea78262e52da38de47301e206459967aa6719bb (diff) | |
| parent | 5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/statemachine/qstatemachine.cpp')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index d7cdec9aac..1d80da55c9 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2331,6 +2331,7 @@ void QStateMachinePrivate::unregisterAllTransitions() unregisterSignalTransition(t); } } +#if QT_CONFIG(qeventtransition) { QList<QEventTransition*> transitions = rootState()->findChildren<QEventTransition*>(); for (int i = 0; i < transitions.size(); ++i) { @@ -2339,6 +2340,7 @@ void QStateMachinePrivate::unregisterAllTransitions() unregisterEventTransition(t); } } +#endif } #if QT_CONFIG(qeventtransition) |