diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-18 06:40:15 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-18 06:40:15 (GMT) |
| commit | 0add74a9339a9d7dda302aa4f31cbb50bdb69908 (patch) | |
| tree | 9d2c767bee200cb79f81aed24551bcb1989eefb7 /src/corelib/statemachine/qfinalstate.h | |
| parent | c22504ae79b45268d603c2b2bc66bd2a59c331c7 (diff) | |
| parent | 3769beacd9126b567f6a42e6c357a7eda004a602 (diff) | |
| download | Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.zip Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.tar.gz Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/statemachine/qfinalstate.h')
| -rw-r--r-- | src/corelib/statemachine/qfinalstate.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index eb8aa0f..fa68394 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -42,11 +42,7 @@ #ifndef QFINALSTATE_H #define QFINALSTATE_H -#ifndef QT_STATEMACHINE_SOLUTION #include <QtCore/qabstractstate.h> -#else -#include "qabstractstate.h" -#endif QT_BEGIN_HEADER |