From 8d330f55ba26600b93dda9fdcfacb571cfd1e94b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 30 Aug 2016 12:23:53 +0200 Subject: 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 --- src/widgets/statemachine/qbasickeyeventtransition.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/widgets/statemachine/qbasickeyeventtransition.cpp') diff --git a/src/widgets/statemachine/qbasickeyeventtransition.cpp b/src/widgets/statemachine/qbasickeyeventtransition.cpp index fe2edca613..c833e64822 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition.cpp +++ b/src/widgets/statemachine/qbasickeyeventtransition.cpp @@ -39,8 +39,6 @@ #include "qbasickeyeventtransition_p.h" -#ifndef QT_NO_STATEMACHINE - #include #include #include @@ -204,5 +202,3 @@ void QBasicKeyEventTransition::onTransition(QEvent *) QT_END_NAMESPACE #include "moc_qbasickeyeventtransition_p.cpp" - -#endif //QT_NO_STATEMACHINE -- cgit v1.2.3