diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-30 12:23:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-11 06:05:09 +0000 |
| commit | 8d330f55ba26600b93dda9fdcfacb571cfd1e94b (patch) | |
| tree | 7bd9a2facc8b72ded18b55f7351cd40395bb33cd /src/corelib/statemachine/qsignaltransition.h | |
| parent | 267dd9133d76d466c0f940e7286dc9ba03bac18e (diff) | |
Fix build with statemachine feature disabled
The sources of the state machine are excluded completely at the build
system level instead of littering them with #ifs.
All remaining usages of QT_NO_STATEMACHINE are converted to
QT_CONFIG(statemachine) or a QT_REQUIRE_CONFIG(statemachine).
Also make the qeventtransition feature dependent on statemachine.
Change-Id: Ib05c7ca263a02042523fff8f794fa87342df1069
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition.h')
| -rw-r--r-- | src/corelib/statemachine/qsignaltransition.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index d7cf8584da..97c2916d9a 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -43,10 +43,9 @@ #include <QtCore/qabstracttransition.h> #include <QtCore/qmetaobject.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(statemachine); -#ifndef QT_NO_STATEMACHINE +QT_BEGIN_NAMESPACE class QSignalTransitionPrivate; class Q_CORE_EXPORT QSignalTransition : public QAbstractTransition @@ -95,8 +94,6 @@ private: Q_DECLARE_PRIVATE(QSignalTransition) }; -#endif //QT_NO_STATEMACHINE - QT_END_NAMESPACE #endif |