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/qhistorystate.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/qhistorystate.h')
| -rw-r--r-- | src/corelib/statemachine/qhistorystate.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index 89d4d7a9e4..c20053abf6 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -42,10 +42,9 @@ #include <QtCore/qabstractstate.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(statemachine); -#ifndef QT_NO_STATEMACHINE +QT_BEGIN_NAMESPACE class QAbstractTransition; class QHistoryStatePrivate; @@ -91,8 +90,6 @@ private: Q_DECLARE_PRIVATE(QHistoryState) }; -#endif //QT_NO_STATEMACHINE - QT_END_NAMESPACE #endif |