diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
| commit | 6d25d222b2bb418139e123b59366db908ee3188a (patch) | |
| tree | e00b67dcf860d5cd9bcdcaccf8bfc56f55269e94 /src/corelib/statemachine/qstate.cpp | |
| parent | cea8678e5fca8b33bbd5da057282888bc260a5c9 (diff) | |
| parent | e50916796adc0dee112505ed617f9b83e99526fb (diff) | |
| download | Qt-6d25d222b2bb418139e123b59366db908ee3188a.zip Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.gz Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/corelib/statemachine/qstate.cpp')
| -rw-r--r-- | src/corelib/statemachine/qstate.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index ebb0b47..5dd56c0 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -40,6 +40,9 @@ ****************************************************************************/ #include "qstate.h" + +#ifndef QT_NO_STATEMACHINE + #include "qstate_p.h" #include "qhistorystate.h" #include "qhistorystate_p.h" @@ -482,3 +485,5 @@ bool QState::event(QEvent *e) */ QT_END_NAMESPACE + +#endif //QT_NO_STATEMACHINE |