4940bc8 · unity8 · git.iko.soy

on xenial help sign in

Fix Unity.Test on Qt > 5.9

4940bc8Ivan Semkin8 years ago

tests/utils/CMakeLists.txt+1−1

@@ -1 +1 @@

1−#add_subdirectory(modules) #FIXME broken with qt 5.9

1+add_subdirectory(modules)

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+10−1

@@ -15,6 +15,7 @@

15 */

17#include "TouchEventSequenceWrapper.h"

18+#include <private/qquickanimatorcontroller_p.h>

18#include <private/qquickwindow_p.h>

19#include <private/qquickwindow_p.h>

20TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence eventSequence, QQuickItem *item)

21TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence eventSequence, QQuickItem *item)

@@ -34,7 +35,15 @@ void TouchEventSequenceWrapper::commit(bool processEvents)

35 if (window) {

36 if (window) {

36 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(window);

37 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(window);

37− wp->flushDelayedTouchEvent();

38+ if (wp->delayedTouch) {

39+ wp->deliverDelayedTouchEvent();

40+

41+ // Touch events which constantly start animations (such as a behavior tracking

42+ // the mouse point) need animations to start.

43+ QQmlAnimationTimer *ut = QQmlAnimationTimer::instance();

44+ if (ut && ut->hasStartAnimationPending())

45+ ut->startAnimations();

46+ }

38 }

47 }

39}

48}