diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-05-13 10:39:11 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-05-13 10:39:11 (GMT) |
| commit | 6b2d3e437bf1632191f62c603f754f895d4122eb (patch) | |
| tree | 1a43dbafd5047014d97c257ae0651fc38ac7c14f /src/corelib/statemachine/qstatemachine.h | |
| parent | 5c7c8208c559d82e96aa7aa8c753c224d89022a2 (diff) | |
| download | Qt-6b2d3e437bf1632191f62c603f754f895d4122eb.zip Qt-6b2d3e437bf1632191f62c603f754f895d4122eb.tar.gz Qt-6b2d3e437bf1632191f62c603f754f895d4122eb.tar.bz2 | |
kill the QT_STATEMACHINE_SOLUTION define
We won't release another Qt Solution, so the define is no longer needed.
Diffstat (limited to 'src/corelib/statemachine/qstatemachine.h')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 5dc6c0b..2a98a9a 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -42,11 +42,7 @@ #ifndef QSTATEMACHINE_H #define QSTATEMACHINE_H -#ifndef QT_STATEMACHINE_SOLUTION -# include <QtCore/qabstractstate.h> -#else -# include "qabstractstate.h" -#endif +#include <QtCore/qabstractstate.h> #include <QtCore/qlist.h> #include <QtCore/qobject.h> @@ -151,9 +147,6 @@ protected: bool event(QEvent *e); protected: -#ifdef QT_STATEMACHINE_SOLUTION - QStateMachinePrivate *d_ptr; -#endif QStateMachine(QStateMachinePrivate &dd, QObject *parent); private: |