diff options
| -rw-r--r-- | configure.json | 4 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.h | 2 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstatemachine_p.h | 6 | ||||
| -rw-r--r-- | src/corelib/statemachine/statemachine.pri | 10 |
5 files changed, 20 insertions, 14 deletions
diff --git a/configure.json b/configure.json index f56c2651ce..3f007d485d 100644 --- a/configure.json +++ b/configure.json @@ -2518,6 +2518,10 @@ "description": "Mimetype handling", "output": [ "publicFeature", "feature" ] }, + "qeventtransition": { + "description": "QEventTransition class", + "output": [ "publicFeature" ] + }, "extra_features": { "comment": "### remove, once qfeatures.txt is ported to the new system", "output": [ "extraFeatures" ] diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index e3cfd7b988..db395b24dd 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -57,7 +57,7 @@ #include "private/qobject_p.h" #include "private/qthread_p.h" -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) #include "qeventtransition.h" #include "qeventtransition_p.h" #endif @@ -2196,7 +2196,7 @@ void QStateMachinePrivate::maybeRegisterTransition(QAbstractTransition *transiti if (QSignalTransition *st = qobject_cast<QSignalTransition*>(transition)) { maybeRegisterSignalTransition(st); } -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) else if (QEventTransition *et = qobject_cast<QEventTransition*>(transition)) { maybeRegisterEventTransition(et); } @@ -2208,7 +2208,7 @@ void QStateMachinePrivate::registerTransition(QAbstractTransition *transition) if (QSignalTransition *st = qobject_cast<QSignalTransition*>(transition)) { registerSignalTransition(st); } -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) else if (QEventTransition *oet = qobject_cast<QEventTransition*>(transition)) { registerEventTransition(oet); } @@ -2220,7 +2220,7 @@ void QStateMachinePrivate::unregisterTransition(QAbstractTransition *transition) if (QSignalTransition *st = qobject_cast<QSignalTransition*>(transition)) { unregisterSignalTransition(st); } -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) else if (QEventTransition *oet = qobject_cast<QEventTransition*>(transition)) { unregisterEventTransition(oet); } @@ -2342,7 +2342,7 @@ void QStateMachinePrivate::unregisterAllTransitions() } } -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) void QStateMachinePrivate::maybeRegisterEventTransition(QEventTransition *transition) { if ((state == Running) && configuration.contains(transition->sourceState())) @@ -2872,7 +2872,7 @@ bool QStateMachine::event(QEvent *e) return QState::event(e); } -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) /*! \reimp */ diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 843844e172..031d9ceee2 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -141,7 +141,7 @@ public: QSet<QAbstractState*> configuration() const; -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; #endif diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 1305558ef8..45634e27fb 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE class QEvent; -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) class QEventTransition; #endif class QSignalEventGenerator; @@ -186,7 +186,7 @@ public: void registerSignalTransition(QSignalTransition *transition); void unregisterSignalTransition(QSignalTransition *transition); void registerMultiThreadedSignalTransitions(); -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) void maybeRegisterEventTransition(QEventTransition *transition); void registerEventTransition(QEventTransition *transition); void unregisterEventTransition(QEventTransition *transition); @@ -301,7 +301,7 @@ public: QHash<const QObject*, QVector<int> > connections; QMutex connectionsMutex; -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) QHash<QObject*, QHash<QEvent::Type, int> > qobjectEvents; #endif QFreeList<void> delayedEventIdFreeList; diff --git a/src/corelib/statemachine/statemachine.pri b/src/corelib/statemachine/statemachine.pri index c5396a2ef8..52df10a3bc 100644 --- a/src/corelib/statemachine/statemachine.pri +++ b/src/corelib/statemachine/statemachine.pri @@ -22,8 +22,10 @@ SOURCES += $$PWD/qstatemachine.cpp \ $$PWD/qabstracttransition.cpp \ $$PWD/qsignaltransition.cpp -!contains(DEFINES, QT_NO_STATEMACHINE_EVENTFILTER) { -HEADERS += $$PWD/qeventtransition.h \ - $$PWD/qeventtransition_p.h -SOURCES += $$PWD/qeventtransition.cpp +qtConfig(qeventtransition) { + HEADERS += \ + $$PWD/qeventtransition.h \ + $$PWD/qeventtransition_p.h + SOURCES += \ + $$PWD/qeventtransition.cpp } |