diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 18:42:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-13 22:19:38 +0000 |
| commit | 60e3bfe958cb0130e5dd71296c000c1f8e23ec0e (patch) | |
| tree | 0e74b95183397ff5011879edcfba670504d190c0 /src/corelib/statemachine/qstatemachine.cpp | |
| parent | 8b07d2c5a5707648f74c9a6dcf56a7372efeffcc (diff) | |
| parent | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/statemachine/qstatemachine.cpp')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index db395b24dd..433f595611 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -38,9 +38,6 @@ ****************************************************************************/ #include "qstatemachine.h" - -#ifndef QT_NO_STATEMACHINE - #include "qstate.h" #include "qstate_p.h" #include "qstatemachine_p.h" @@ -3235,5 +3232,3 @@ QT_END_NAMESPACE #include "qstatemachine.moc" #include "moc_qstatemachine.cpp" - -#endif //QT_NO_STATEMACHINE |