git.iko.soy/unity8
on xenial help sign in
More ifdefs
8f0438cAlbert Astals Cid
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+5−1
compare with xenial
unifiedsplit
@@ -20,7 +20,9 @@
20#include <QtQml/QQmlEngine>
20#include <QtQml/QQmlEngine>
21#include <QPointer>
21#include <QPointer>
22#include <private/qquickmousearea_p.h>
22#include <private/qquickmousearea_p.h>
23+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
23−#include <private/qquickwindow_p.h>
24+ #include <private/qquickwindow_p.h>
25+#endif
24
26
25
27
26#include <DirectionalDragArea.h>
28#include <DirectionalDragArea.h>
@@ -815,7 +817,9 @@ void tst_DirectionalDragArea::sceneDistance()
815
817
816 QTest::touchEvent(m_view, m_device).press(0, touchPoint.toPoint());
818 QTest::touchEvent(m_view, m_device).press(0, touchPoint.toPoint());
817
819
820+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
818 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(m_view);
821 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(m_view);
822+#endif
819 for (int i = 0; i < totalMovementSteps; ++i) {
823 for (int i = 0; i < totalMovementSteps; ++i) {
820 touchPoint += touchMovement;
824 touchPoint += touchMovement;
821 passTime(movementTimeStepMs);
825 passTime(movementTimeStepMs);
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+3−1
@@ -19,7 +19,9 @@
19#include <QQmlEngine>
19#include <QQmlEngine>
20#include <QQuickView>
20#include <QQuickView>
21#include <QSharedPointer>
21#include <QSharedPointer>
22+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
22−#include <private/qquickwindow_p.h>
23+ #include <private/qquickwindow_p.h>
24+#endif
23
25
24// C++ std lib
26// C++ std lib
25#include <functional>
27#include <functional>