From 8d330f55ba26600b93dda9fdcfacb571cfd1e94b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
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 <jake.petroules@qt.io>
---
 src/widgets/statemachine/qbasicmouseeventtransition_p.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/widgets/statemachine/qbasicmouseeventtransition_p.h')

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
-- 
cgit v1.2.3