summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qeventtransition.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-05-13 12:39:11 +0200
committerKent Hansen <khansen@trolltech.com>2009-05-13 12:39:11 +0200
commit6b2d3e437bf1632191f62c603f754f895d4122eb (patch)
tree1a43dbafd5047014d97c257ae0651fc38ac7c14f /src/corelib/statemachine/qeventtransition.h
parent5c7c8208c559d82e96aa7aa8c753c224d89022a2 (diff)
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/qeventtransition.h')
-rw-r--r--src/corelib/statemachine/qeventtransition.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index a128cee9d6..68ee4fc35e 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -42,11 +42,7 @@
#ifndef QEVENTTRANSITION_H
#define QEVENTTRANSITION_H
-#ifndef QT_STATEMACHINE_SOLUTION
#include <QtCore/qabstracttransition.h>
-#else
-#include "qabstracttransition.h"
-#endif
#include <QtCore/qcoreevent.h>
QT_BEGIN_HEADER
@@ -60,9 +56,7 @@ class Q_CORE_EXPORT QEventTransition : public QAbstractTransition
{
Q_OBJECT
Q_PROPERTY(QObject* eventObject READ eventObject WRITE setEventObject)
-#ifndef QT_STATEMACHINE_SOLUTION
Q_PROPERTY(QEvent::Type eventType READ eventType WRITE setEventType)
-#endif
public:
QEventTransition(QState *sourceState = 0);
QEventTransition(QObject *object, QEvent::Type type, QState *sourceState = 0);