8b49c63 · unity8 · git.iko.soy

git.iko.soy/unity8

Bump the version to secure UITK compatibility

commit8b49c636e00c3f5cc58c328b764eb50cc45a72ad authorBileto Bot <ci-train-bot@canonical.com> dateThu 28 Jul 2016, 08:16 (10 years ago) parent07e4e7b 06ad62d

19 files changed+76−49

compare with xenial

unifiedsplit

debian/changelog+6

@@ -1,3 +1,9 @@

1+unity8 (8.14-0ubuntu1) UNRELEASED; urgency=medium

3+ * Bump the version to secure UITK compatibility

5+ -- Zoltán Balogh <zoltan@bakter.hu> Mon, 11 Jul 2016 12:42:29 +0200

17unity8 (8.13+16.10.20160714+fix1-0ubuntu2~1) yakkety; urgency=medium

39 * Rebuild against Qt 5.6.

debian/control+6−6

@@ -31,8 +31,8 @@ Build-Depends: cmake,

3131 libqt5svg5-dev,

3232 libqt5xmlpatterns5-dev,

3333 libsystemsettings-dev,

34− libubuntugestures5-dev,

35− libubuntugestures5-private-dev,

34+ libubuntugestures5-dev (>= 1.3.2030),

35+ libubuntugestures5-private-dev (>= 1.3.2030),

3636 libudev-dev,

3737 libunity-api-dev (>= 7.116),

3838 libusermetricsoutput1-dev,

@@ -51,7 +51,7 @@ Build-Depends: cmake,

5151 qml-module-qtquick2,

5252 qml-module-qtsysteminfo,

5353 qml-module-qttest,

54− qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),

54+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

5555 qml-module-ubuntu-web,

5656 qt5-default,

5757 qtbase5-dev (>= 5.4),

@@ -76,7 +76,7 @@ X-Ubuntu-Use-Langpack: yes

7676Package: indicators-client

7777Architecture: amd64 armhf i386

7878Depends: qmenumodel-qml (>= 0.2.9),

79− qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),

79+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

8080 unity8 (= ${binary:Version}),

8181 ${misc:Depends},

8282 ${shlibs:Depends},

@@ -146,7 +146,7 @@ Description: Unity 8 shell

146146Package: unity8-common

147147Architecture: all

148148Depends: qml-module-qtquick-layouts,

149− qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),

149+ qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

150150 qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

151151 qtdeclarative5-ubuntu-settings-components (>= 0.7),

152152 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

@@ -178,7 +178,7 @@ Depends: autopilot-qt5 (>= 1.4),

178178 python3-fixtures,

179179 python3-gi,

180180 qttestability-autopilot (>= 1.4),

181− ubuntu-ui-toolkit-autopilot (>= 1.3.1845),

181+ ubuntu-ui-toolkit-autopilot (>= 1.3.2030),

182182 unity-scope-click,

183183 unity8 (= ${source:Version}),

184184 unity8-fake-env (= ${source:Version}),

plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+1−1

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

2121#include "AxisVelocityCalculator.h"

2222#include <QtCore/QElapsedTimer>

2323

24−using namespace UbuntuGestures;

24+UG_USE_NAMESPACE

2525

2626AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)

2727 : AxisVelocityCalculator(SharedTimeSource(new RealTimeSource), parent)

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+4−4

@@ -24,7 +24,7 @@

2424#include "UbuntuGesturesQmlGlobal.h"

2525#include <stdint.h>

2626#include <QtCore/QObject>

27−#include <TimeSource>

27+#include <UbuntuGestures/private/timesource_p.h>

2828

2929/*

3030 Estimates the current velocity of a finger based on recent movement along an axis

@@ -68,7 +68,7 @@ public:

6868 /*

6969 Constructor that takes a TimeSource

7070 */

71− AxisVelocityCalculator(const UbuntuGestures::SharedTimeSource &timeSource, QObject *parent = 0);

71+ AxisVelocityCalculator(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource, QObject *parent = 0);

7272

7373 virtual ~AxisVelocityCalculator();

7474

@@ -90,7 +90,7 @@ public:

9090 /*

9191 Replaces the TimeSource with the given one. Useful for testing purposes.

9292 */

93− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);

93+ void setTimeSource(const UG_PREPEND_NAMESPACE(SharedTimeSource) &timeSource);

9494

9595 /*

9696 The minimum amount of samples needed for a velocity calculation.

@@ -138,7 +138,7 @@ private:

138138 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */

139139 int m_samplesWrite; /* index where the next sample will be written */

140140

141− UbuntuGestures::SharedTimeSource m_timeSource;

141+ UG_PREPEND_NAMESPACE(SharedTimeSource) m_timeSource;

142142

143143 qreal m_trackedPosition;

144144};

plugins/Ubuntu/Gestures/CMakeLists.txt+1

@@ -27,6 +27,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})

2727include_directories(

2828 SYSTEM

2929 ${UBUNTUGESTURES_INCLUDE_DIRS}

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

3031)

3132

3233# There's no cmake var for v8 include path :-/ so create one

plugins/Ubuntu/Gestures/TouchGate.cpp+6−4

@@ -20,16 +20,18 @@

2020#include <QDebug>

2121#include <QQuickWindow>

2222

23−#include <TouchOwnershipEvent>

24−#include <TouchRegistry>

23+#include <UbuntuGestures/private/touchownershipevent_p.h>

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

2525

2626#if TOUCHGATE_DEBUG

2727#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params

28−#include <DebugHelpers.h>

28+#include <UbuntuGestures/private/debughelpers_p.h>

2929#else // TOUCHGATE_DEBUG

3030#define ugDebug(params) ((void)0)

3131#endif // TOUCHGATE_DEBUG

3232

33+UG_USE_NAMESPACE

34+

3335TouchGate::TouchGate(QQuickItem *parent)

3436 : QQuickItem(parent)

3537{

@@ -40,7 +42,7 @@ TouchGate::TouchGate(QQuickItem *parent)

4042bool TouchGate::event(QEvent *e)

4143{

4244 if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

43− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(e));

45+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(e));

4446 return true;

4547 } else {

4648 return QQuickItem::event(e);

plugins/Ubuntu/Gestures/TouchGate.h+3−2

@@ -19,6 +19,7 @@

1919

2020#include "UbuntuGesturesQmlGlobal.h"

2121#include "TouchDispatcher.h"

22+#include <UbuntuGestures/ubuntugesturesglobal.h>

2223

2324#include <QQuickItem>

2425#include <QList>

@@ -26,7 +27,7 @@

2627

2728#define TOUCHGATE_DEBUG 0

2829

29−class TouchOwnershipEvent;

30+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)

3031

3132/*

3233 Blocks the passage of events until ownership over the related touch points is granted.

@@ -82,7 +83,7 @@ private:

8283 ulong timestamp;

8384 };

8485

85− void touchOwnershipEvent(TouchOwnershipEvent *event);

86+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);

8687 bool isTouchPointOwned(int touchId) const;

8788 void storeTouchEvent(QTouchDevice *device,

8889 Qt::KeyboardModifiers modifiers,

plugins/Ubuntu/Gestures/TouchGestureArea.cpp+9−7

@@ -16,9 +16,9 @@

1616

1717#include "TouchGestureArea.h"

1818

19−#include <UbuntuGestures/TouchOwnershipEvent>

20−#include <UbuntuGestures/TouchRegistry>

21−#include <UbuntuGestures/UnownedTouchEvent>

19+#include <UbuntuGestures/private/touchownershipevent_p.h>

20+#include <UbuntuGestures/private/touchregistry_p.h>

21+#include <UbuntuGestures/private/unownedtouchevent_p.h>

2222// #include "TouchRegistry.h"

2323// #include "UnownedTouchEvent.h"

2424

@@ -26,6 +26,8 @@

2626#include <QStyleHints>

2727#include <private/qquickwindow_p.h>

2828

29+UG_USE_NAMESPACE

30+

2931#define TOUCHGESTUREAREA_DEBUG 0

3032

3133// TODO - understand more about why we lose touch event releases.

@@ -135,7 +137,7 @@ TouchGestureArea::TouchGestureArea(QQuickItem* parent)

135137 , m_recognitionPeriod(50)

136138 , m_releaseRejectPeriod(100)

137139{

138− setRecognitionTimer(new UbuntuGestures::Timer(this));

140+ setRecognitionTimer(new Timer(this));

139141 m_recognitionTimer->setInterval(m_recognitionPeriod);

140142 m_recognitionTimer->setSingleShot(true);

141143}

@@ -153,10 +155,10 @@ bool TouchGestureArea::event(QEvent *event)

153155{

154156 // Process unowned touch events (handles update/release for incomplete gestures)

155157 if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

156− touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));

158+ touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(event));

157159 return true;

158160 } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {

159− unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());

161+ unownedTouchEvent(static_cast<UnownedTouchEvent*>(event)->touchEvent());

160162 return true;

161163 }

162164

@@ -608,7 +610,7 @@ void TouchGestureArea::setInternalStatus(uint newStatus)

608610 }

609611}

610612

611−void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)

613+void TouchGestureArea::setRecognitionTimer(AbstractTimer *timer)

612614{

613615 int interval = 0;

614616 bool timerWasRunning = false;

plugins/Ubuntu/Gestures/TouchGestureArea.h+7−6

@@ -21,10 +21,11 @@

2121

2222#include <QQuickItem>

2323

24−#include <UbuntuGestures/Timer>

24+#include <UbuntuGestures/ubuntugesturesglobal.h>

25+#include <UbuntuGestures/private/timer_p.h>

2526

26−class TouchOwnershipEvent;

27−class UnownedTouchEvent;

27+UG_FORWARD_DECLARE_CLASS(TouchOwnershipEvent)

28+UG_FORWARD_DECLARE_CLASS(UnownedTouchEvent)

2829

2930class GestureTouchPoint : public QObject

3031{

@@ -141,7 +142,7 @@ public:

141142

142143 bool event(QEvent *e) override;

143144

144− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);

145+ void setRecognitionTimer(UG_PREPEND_NAMESPACE(AbstractTimer) *timer);

145146

146147 int status() const;

147148 bool dragging() const;

@@ -194,7 +195,7 @@ private:

194195 void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);

195196 void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);

196197

197− void touchOwnershipEvent(TouchOwnershipEvent *event);

198+ void touchOwnershipEvent(UG_PREPEND_NAMESPACE(TouchOwnershipEvent) *event);

198199 void updateTouchPoints(QTouchEvent *event);

199200

200201 GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);

@@ -209,7 +210,7 @@ private:

209210 uint m_status;

210211 QSet<int> m_candidateTouches;

211212 QSet<int> m_watchedTouches;

212− UbuntuGestures::AbstractTimer *m_recognitionTimer;

213+ UG_PREPEND_NAMESPACE(AbstractTimer) *m_recognitionTimer;

213214

214215 bool m_dragging;

215216 QHash<int, GestureTouchPoint*> m_liveTouchPoints;

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1

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

77 SYSTEM

88 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

99 ${UBUNTUGESTURES_INCLUDE_DIRS}

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

1011 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

1112)

1213

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+3−3

@@ -22,10 +22,10 @@

2222#include <QQuickView>

2323#include <QtTest>

2424

25−#include <Timer>

26−#include <TouchRegistry>

25+#include <UbuntuGestures/private/timer_p.h>

26+#include <UbuntuGestures/private/touchregistry_p.h>

2727

28−using namespace UbuntuGestures;

28+UG_USE_NAMESPACE

2929

3030GestureTest::GestureTest(const QString &qmlFilename)

3131 : QObject(), m_device(nullptr), m_view(nullptr), m_qmlFilename(qmlFilename)

tests/plugins/Ubuntu/Gestures/GestureTest.h+4−5

@@ -19,14 +19,13 @@

1919

2020#include <QQuickItem>

2121#include <QTouchEvent>

22+#include <UbuntuGestures/ubuntugesturesglobal.h>

2223

2324class QQuickView;

2425class QTouchDevice;

2526

26−namespace UbuntuGestures {

27− class FakeTimerFactory;

28−}

29−class TouchRegistry;

27+UG_FORWARD_DECLARE_CLASS(FakeTimerFactory)

28+UG_FORWARD_DECLARE_CLASS(TouchRegistry)

3029

3130// C++ std lib

3231#include <functional>

@@ -96,7 +95,7 @@ protected:

9695 QTouchDevice *m_device;

9796 QQuickView *m_view;

9897 TouchRegistry *m_touchRegistry;

99− UbuntuGestures::FakeTimerFactory *m_fakeTimerFactory;

98+ UG_PREPEND_NAMESPACE(FakeTimerFactory) *m_fakeTimerFactory;

10099 QString m_qmlFilename;

101100};

102101

tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+1−1

@@ -20,7 +20,7 @@

2020

2121#include <AxisVelocityCalculator.h>

2222

23−class FakeTimeSource : public UbuntuGestures::TimeSource {

23+class FakeTimeSource : public UG_PREPEND_NAMESPACE(TimeSource) {

2424public:

2525 FakeTimeSource() : m_value(0) {}

2626

tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+1−1

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

2121#include "TestItem.h"

2222#include "Direction.h"

2323

24−using namespace UbuntuGestures;

24+UG_USE_NAMESPACE

2525

2626class tst_FloatingFlickable: public GestureTest

2727{

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+3−1

@@ -25,10 +25,12 @@

2525#include <functional>

2626

2727#include <TouchGate.h>

28−#include <TouchRegistry>

28+#include <UbuntuGestures/private/touchregistry_p.h>

2929

3030#include "TestItem.h"

3131

32+UG_USE_NAMESPACE

33+

3234class CandidateItem : public QQuickItem

3335{

3436 Q_OBJECT

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

@@ -24,10 +24,10 @@

2424#include <UbuntuGestures/private/ucswipearea_p_p.h>

2525

2626#include <AxisVelocityCalculator.h>

27−#include <Timer>

27+#include <UbuntuGestures/private/timer_p.h>

2828#include "Direction.h"

2929

30−using namespace UbuntuGestures;

30+UG_USE_NAMESPACE

3131

3232class tst_DragHandle: public QObject

3333{

tests/qmltests/Components/tst_EdgeDragEvaluator.cpp+2−2

@@ -24,9 +24,9 @@

2424// Ubuntu.Gestures plugin

2525#include <AxisVelocityCalculator.h>

2626#include <Direction.h>

27−#include <Timer>

27+#include <UbuntuGestures/private/timer_p.h>

2828

29−using namespace UbuntuGestures;

29+UG_USE_NAMESPACE

3030

3131class tst_EdgeDragEvaluator: public QObject

3232{

tests/utils/modules/Unity/Test/CMakeLists.txt+1

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

1313 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

1414 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

1515 ${UBUNTUGESTURES_INCLUDE_DIRS}

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

1617)

1718

1819set(UnityTestQML_SOURCES

tests/utils/modules/Unity/Test/testutil.cpp+15−4

@@ -24,10 +24,11 @@

2424#include <private/qquickanimation_p.h>

2525

2626// UbuntuGestures lib

27−#include <TouchRegistry>

28−#include <Timer>

27+#include <UbuntuGestures/ubuntugesturesglobal.h>

28+#include <UbuntuGestures/private/touchregistry_p.h>

29+#include <UbuntuGestures/private/timer_p.h>

2930

30−using namespace UbuntuGestures;

31+UG_USE_NAMESPACE

3132

3233TestUtil::TestUtil(QObject *parent)

3334 : QObject(parent)

@@ -50,8 +51,18 @@ TestUtil::isInstanceOf(QObject *obj, QString name)

5051 const QMetaObject *metaObject = obj->metaObject();

5152 while (!result && metaObject) {

5253 const QString className = metaObject->className();

53− const QString qmlName = className.left(className.indexOf("_QMLTYPE_"));

54+ QString qmlName = className.left(className.indexOf("_QMLTYPE_"));

5455 result = qmlName == name;

56+ // test for known namespaces

57+ if (!result) {

58+ // remove UbuntuGestures and UbuntuToolkit namespace

59+ qmlName = qmlName.remove(QString("UbuntuGestures::"));

60+ result = qmlName == name;

61+ }

62+ if (!result) {

63+ qmlName = qmlName.remove(QString("UbuntuToolkit::"));

64+ result = qmlName == name;

65+ }

5566 metaObject = metaObject->superClass();

5667 }

5768 }