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/widgets/statemachine/qbasicmouseeventtransition_p.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/widgets/statemachine/qbasicmouseeventtransition_p.h')
-rw-r--r-- | src/widgets/statemachine/qbasicmouseeventtransition_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index 72320a52dc..d6d37eb03e 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -51,13 +51,11 @@ // We mean it. // -#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qabstracttransition.h> - -#ifndef QT_NO_STATEMACHINE - #include <QtGui/qevent.h> +QT_REQUIRE_CONFIG(qeventtransition); + QT_BEGIN_NAMESPACE class QPainterPath; @@ -95,6 +93,4 @@ private: QT_END_NAMESPACE -#endif //QT_NO_STATEMACHINE - #endif |