3c93564 · unity8 · git.iko.soy

debian/control+1

compare with xenial

unifiedsplit

@@ -29,6 +29,7 @@ Build-Depends: cmake,

29 libqt5xmlpatterns5-dev,

30 libsystemsettings-dev,

31 libubuntugestures5-dev,

32+ libubuntugestures5-private-dev,

32 libudev-dev,

33 libudev-dev,

33 libunity-api-dev (>= 7.105),

34 libunity-api-dev (>= 7.105),

34 libusermetricsoutput1-dev,

35 libusermetricsoutput1-dev,

tests/qmltests/Components/CMakeLists.txt+1

@@ -10,6 +10,7 @@ include_directories(

10 ${CMAKE_CURRENT_BINARY_DIR}

11 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

12 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

13+ ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

13 )

14 )

14

15

15add_executable(DragHandleTestExec tst_DragHandle.cpp)

16add_executable(DragHandleTestExec tst_DragHandle.cpp)

tests/qmltests/Components/tst_DragHandle.cpp+6−6

@@ -21,6 +21,7 @@

21#include <QtQuick/QQuickView>

22#include <QtQml/QQmlEngine>

23#include <private/qquickwindow_p.h>

24+#include <UbuntuGestures/private/ucswipearea_p_p.h>

24

25

25#include <AxisVelocityCalculator.h>

26#include <AxisVelocityCalculator.h>

26#include <Timer>

27#include <Timer>

@@ -200,12 +201,11 @@ QQuickItem *tst_DragHandle::fetchAndSetupDragHandle(const char *objectName)

200 QQuickItem *dragHandle =

201 QQuickItem *dragHandle =

201 m_view->rootObject()->findChild<QQuickItem*>(objectName);

202 m_view->rootObject()->findChild<QQuickItem*>(objectName);

202 Q_ASSERT(dragHandle != 0);

203 Q_ASSERT(dragHandle != 0);

203− auto children = dragHandle->findChildren<QObject*>();

204+ UCSwipeArea *swipeArea = dynamic_cast<UCSwipeArea*>(dragHandle);

204− Q_FOREACH(QObject *child, children) {

205+ if (swipeArea) {

205− if (child->metaObject()->className() == QByteArray("UCSwipeAreaPrivate")) {

206+ UCSwipeAreaPrivate *swipeAreaPrivate = dynamic_cast<UCSwipeAreaPrivate *>(QQuickItemPrivate::get(swipeArea));

206− QMetaObject::invokeMethod(child, "setRecognitionTimer", Q_ARG(UbuntuGestures::AbstractTimer*, m_fakeTimer));

207+ swipeAreaPrivate->setRecognitionTimer(m_fakeTimer);

207− QMetaObject::invokeMethod(child, "setTimeSource", Q_ARG(UbuntuGestures::SharedTimeSource, m_fakeTimeSource));

208+ swipeAreaPrivate->setTimeSource(m_fakeTimeSource);

208− }

209 }

210

211 AxisVelocityCalculator *edgeDragEvaluator =