on xenial help sign in
Fix Unity.Test on Qt > 5.9
commit4940bc80c1a1238d19298ab30d899e42d7fb946e authorIvan Semkin <ivan@semkin.ru> dateSat 23 Jun 2018, 18:51 (8 years ago) parentc4e012d
2 files changed+11−2
tests/utils/CMakeLists.txt+1−1 tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+10−1
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 @@
1515 */
1616
1717#include "TouchEventSequenceWrapper.h"
18+#include <private/qquickanimatorcontroller_p.h>
1819#include <private/qquickwindow_p.h>
1920
2021TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence eventSequence, QQuickItem *item)
@@ -34,7 +35,15 @@ void TouchEventSequenceWrapper::commit(bool processEvents)
3435
3536 if (window) {
3637 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+ }
3847 }
3948}
4049