git.iko.soy/unity8
on xenial help sign in
Fix borken merge
4ebbd8eAlbert Astals Cid
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp−2
compare with xenial
unifiedsplit
@@ -102,8 +102,6 @@ void tst_FloatingFlickable::flickChangesContentY()
102 QSKIP("This fails due to bug #1564571");
102 QSKIP("This fails due to bug #1564571");
103 QQuickItem *floatingFlickable =
103 QQuickItem *floatingFlickable =
104 m_view->rootObject()->findChild<QQuickItem*>("floatingFlickable");
104 m_view->rootObject()->findChild<QQuickItem*>("floatingFlickable");
105− FloatingFlickable *floatingFlickable =
106− m_view->rootObject()->findChild<FloatingFlickable*>("floatingFlickable");
107 QVERIFY(floatingFlickable != nullptr);
105 QVERIFY(floatingFlickable != nullptr);
108
106
109 floatingFlickable->setProperty("direction", Direction::Vertical);
107 floatingFlickable->setProperty("direction", Direction::Vertical);