diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-13 12:13:13 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-13 12:13:13 (GMT) |
| commit | 0d5d11e67f0189279f180df71e0b6959935bce42 (patch) | |
| tree | 1e1cf4a87673a5c5827d0fe3d26c5b964ee1001d /src/gui | |
| parent | 145f445b6c7fa5546540c07f3bda493f4f825caf (diff) | |
| parent | a82714c6c82f682e02969d9afa551f37f8132653 (diff) | |
| download | Qt-0d5d11e67f0189279f180df71e0b6959935bce42.zip Qt-0d5d11e67f0189279f180df71e0b6959935bce42.tar.gz Qt-0d5d11e67f0189279f180df71e0b6959935bce42.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/statemachine/qguistatemachine.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp index d30265a..b7563d7 100644 --- a/src/gui/statemachine/qguistatemachine.cpp +++ b/src/gui/statemachine/qguistatemachine.cpp @@ -9,13 +9,8 @@ ** ****************************************************************************/ -#ifdef QT_STATEMACHINE_SOLUTION -#include "qstatemachine.h" -#include "qstatemachine_p.h" -#else #include <QtCore/qstatemachine.h> #include <private/qstatemachine_p.h> -#endif #include <QtGui/qevent.h> #include <QtGui/qgraphicssceneevent.h> |