From 6f1b118b4ddb18e1289e7b0626004961f2273cfe Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Tue, 5 Jun 2012 13:23:39 +0200
Subject: Make qstatemachine autotest build without widgets

Change-Id: I3a58cb1cbe0c86aca6e533187e85c166bf0f8957
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 .../corelib/statemachine/qstatemachine/qstatemachine.pro |  3 ++-
 .../statemachine/qstatemachine/tst_qstatemachine.cpp     | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
index f62bbd938b..0ac137e82c 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
+++ b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
@@ -1,5 +1,6 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qstatemachine
-QT = core-private testlib gui widgets
+QT = core-private testlib gui
+!contains(QT_CONFIG, no-widgets): QT += widgets
 SOURCES = tst_qstatemachine.cpp
diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index 14a0bed1b4..862ff96760 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -41,16 +41,20 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/QCoreApplication>
+#ifndef QT_NO_WIDGETS
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QGraphicsScene>
 #include <QtWidgets/QGraphicsSceneEvent>
 #include <QtWidgets/QGraphicsTextItem>
+#endif
 
 #include "qstatemachine.h"
 #include "qstate.h"
 #include "qhistorystate.h"
+#ifndef QT_NO_WIDGETS
 #include "qkeyeventtransition.h"
 #include "qmouseeventtransition.h"
+#endif
 #include "private/qstate_p.h"
 #include "private/qstatemachine_p.h"
 
@@ -108,8 +112,10 @@ private slots:
     void parallelRootState();
     void allSourceToTargetConfigurations();
     void signalTransitions();
+#ifndef QT_NO_WIDGETS
     void eventTransitions();
     void graphicsSceneEventTransitions();
+#endif
     void historyStates();
     void startAndStop();
     void targetStateWithNoParent();
@@ -171,7 +177,9 @@ private slots:
 
     void clonedSignals();
     void postEventFromOtherThread();
+#ifndef QT_NO_WIDGETS
     void eventFilterForApplication();
+#endif
     void eventClassesExported();
     void stopInTransitionToFinalState();
     void stopInEventTest_data();
@@ -2305,6 +2313,7 @@ private:
     QEvent::Type m_eventType;
 };
 
+#ifndef QT_NO_WIDGETS
 void tst_QStateMachine::eventTransitions()
 {
     QPushButton button;
@@ -2611,6 +2620,7 @@ void tst_QStateMachine::graphicsSceneEventTransitions()
     scene.sendEvent(textItem, &mouseEvent);
     QTRY_COMPARE(finishedSpy.count(), 1);
 }
+#endif
 
 void tst_QStateMachine::historyStates()
 {
@@ -3037,7 +3047,7 @@ void tst_QStateMachine::twoAnimatedTransitions()
     trans->addAnimation(fooAnimation2);
 
     QState *s5 = new QState(&machine);
-    QObject::connect(s5, SIGNAL(entered()), QApplication::instance(), SLOT(quit()));
+    QObject::connect(s5, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     s4->addTransition(fooAnimation2, SIGNAL(finished()), s5);
 
     machine.setInitialState(s1);
@@ -3084,7 +3094,7 @@ void tst_QStateMachine::playAnimationTwice()
     trans->addAnimation(fooAnimation);
 
     QState *s5 = new QState(&machine);
-    QObject::connect(s5, SIGNAL(entered()), QApplication::instance(), SLOT(quit()));
+    QObject::connect(s5, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit()));
     s4->addTransition(fooAnimation, SIGNAL(finished()), s5);
 
     machine.setInitialState(s1);
@@ -3849,6 +3859,7 @@ void tst_QStateMachine::postEventFromOtherThread()
     QTRY_COMPARE(finishedSpy.count(), 1);
 }
 
+#ifndef QT_NO_WIDGETS
 void tst_QStateMachine::eventFilterForApplication()
 {
     QStateMachine machine;
@@ -3878,6 +3889,7 @@ void tst_QStateMachine::eventFilterForApplication()
     QCOMPARE(machine.configuration().size(), 1);
     QVERIFY(machine.configuration().contains(s2));
 }
+#endif
 
 void tst_QStateMachine::eventClassesExported()
 {
-- 
cgit v1.2.3