1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-12-12 16:45:09 +0000
3
+++ CMakeLists.txt	2017-01-02 08:48:40 +0000
4
@@ -62,13 +62,13 @@
5
62
                                       ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
62
                                       ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
6
63
63
7
64
include(FindPkgConfig)
64
include(FindPkgConfig)
15
65
find_package(Qt5Core 5.4 REQUIRED)
65
find_package(Qt5Core 5.6 REQUIRED)
16
66
find_package(Qt5Qml 5.4 REQUIRED)
66
find_package(Qt5Qml 5.6 REQUIRED)
17
67
find_package(Qt5Quick 5.4 REQUIRED)
67
find_package(Qt5Quick 5.6 REQUIRED)
18
68
find_package(Qt5Gui 5.4 REQUIRED)
68
find_package(Qt5Gui 5.6 REQUIRED)
19
69
find_package(Qt5DBus 5.4 REQUIRED)
69
find_package(Qt5DBus 5.6 REQUIRED)
20
70
find_package(Qt5Concurrent 5.4 REQUIRED)
70
find_package(Qt5Concurrent 5.6 REQUIRED)
21
71
find_package(Qt5Sql 5.4 REQUIRED)
71
find_package(Qt5Sql 5.6 REQUIRED)
22
72
72
23
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
24
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
25
75
75
26
=== modified file 'debian/control'
27
--- debian/control	2016-12-12 16:45:09 +0000
28
+++ debian/control	2017-01-02 08:48:40 +0000
29
@@ -51,7 +51,7 @@
30
51
               qml-module-qt-labs-folderlistmodel,
51
               qml-module-qt-labs-folderlistmodel,
31
52
               qml-module-qt-labs-settings,
52
               qml-module-qt-labs-settings,
32
53
               qml-module-qtqml-statemachine,
53
               qml-module-qtqml-statemachine,
34
54
               qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
54
               qml-module-qtmultimedia (>= 5.6),
35
55
               qml-module-qtquick-layouts,
55
               qml-module-qtquick-layouts,
36
56
               qml-module-qtquick-xmllistmodel,
56
               qml-module-qtquick-xmllistmodel,
37
57
               qml-module-qtquick2,
57
               qml-module-qtquick2,
38
@@ -60,12 +60,12 @@
39
60
               qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
60
               qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
40
61
               qml-module-ubuntu-web,
61
               qml-module-ubuntu-web,
41
62
               qt5-default,
62
               qt5-default,
43
63
               qtbase5-dev (>= 5.4),
63
               qtbase5-dev (>= 5.6),
44
64
               qtbase5-dev-tools,
64
               qtbase5-dev-tools,
47
65
               qtbase5-private-dev (>= 5.4),
65
               qtbase5-private-dev (>= 5.6),
48
66
               qtdeclarative5-dev (>= 5.4),
66
               qtdeclarative5-dev (>= 5.6),
49
67
               qtdeclarative5-dev-tools,
67
               qtdeclarative5-dev-tools,
51
68
               qtdeclarative5-private-dev (>= 5.4),
68
               qtdeclarative5-private-dev (>= 5.6),
52
69
               qtdeclarative5-ubuntu-content1,
69
               qtdeclarative5-ubuntu-content1,
53
70
               qtdeclarative5-ubuntu-settings-components (>= 0.11),
70
               qtdeclarative5-ubuntu-settings-components (>= 0.11),
54
71
               ttf-ubuntu-font-family,
71
               ttf-ubuntu-font-family,
55
72
72
56
=== modified file 'plugins/AccountsService/AccountsService.h'
57
--- plugins/AccountsService/AccountsService.h	2016-08-08 10:10:25 +0000
58
+++ plugins/AccountsService/AccountsService.h	2017-01-02 08:48:40 +0000
59
@@ -29,7 +29,6 @@
60
29
class AccountsService: public QObject
29
class AccountsService: public QObject
61
30
{
30
{
62
31
    Q_OBJECT
31
    Q_OBJECT
63
32
    Q_ENUMS(PasswordDisplayHint)
64
33
    Q_PROPERTY (QString user
32
    Q_PROPERTY (QString user
65
34
                READ user
33
                READ user
66
35
                WRITE setUser
34
                WRITE setUser
67
@@ -86,6 +85,7 @@
68
86
        Keyboard,
85
        Keyboard,
69
87
        Numeric,
86
        Numeric,
70
88
    };
87
    };
71
88
    Q_ENUM(PasswordDisplayHint)
72
89
89
73
90
    explicit AccountsService(QObject *parent = 0, const QString & user = QString());
90
    explicit AccountsService(QObject *parent = 0, const QString & user = QString());
74
91
    ~AccountsService() = default;
91
    ~AccountsService() = default;
75
92
92
76
=== modified file 'plugins/Cursor/CursorImageInfo.cpp'
77
--- plugins/Cursor/CursorImageInfo.cpp	2016-07-15 14:36:52 +0000
78
+++ plugins/Cursor/CursorImageInfo.cpp	2017-01-02 08:48:40 +0000
79
@@ -108,8 +108,7 @@
80
108
QUrl CursorImageInfo::imageSource() const
108
QUrl CursorImageInfo::imageSource() const
81
109
{
109
{
82
110
    auto urlString = QString("image://cursor/%1/%2/%3")
110
    auto urlString = QString("image://cursor/%1/%2/%3")
85
111
        .arg(m_themeName)
111
        .arg(m_themeName, m_cursorName)
84
112
        .arg(m_cursorName)
86
113
        .arg(m_cursorHeight);
112
        .arg(m_cursorHeight);
87
114
113
88
115
    return QUrl(urlString);
114
    return QUrl(urlString);
89
116
115
90
=== modified file 'plugins/Dash/abstractdashview.cpp'
91
--- plugins/Dash/abstractdashview.cpp	2016-07-12 15:05:58 +0000
92
+++ plugins/Dash/abstractdashview.cpp	2017-01-02 08:48:40 +0000
93
@@ -23,7 +23,7 @@
94
23
 , m_asyncRequestedIndex(-1)
23
 , m_asyncRequestedIndex(-1)
95
24
 , m_columnSpacing(0)
24
 , m_columnSpacing(0)
96
25
 , m_rowSpacing(0)
25
 , m_rowSpacing(0)
98
26
 , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
26
 , m_buffer(320) // Same value as QML_VIEW_DEFAULTCACHEBUFFER in qquickitemview.cpp (Qt 5.6)
99
27
 , m_displayMarginBeginning(0)
27
 , m_displayMarginBeginning(0)
100
28
 , m_displayMarginEnd(0)
28
 , m_displayMarginEnd(0)
101
29
 , m_needsRelayout(false)
29
 , m_needsRelayout(false)
102
30
30
103
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
104
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-07-28 15:34:29 +0000
105
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2017-01-02 08:48:40 +0000
106
@@ -46,18 +46,18 @@
107
46
    Q_PROPERTY(QString hostname READ hostname CONSTANT)
46
    Q_PROPERTY(QString hostname READ hostname CONSTANT)
108
47
    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
47
    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
109
48
48
110
49
    Q_ENUMS(PromptType MessageType)
111
50
112
51
public:
49
public:
113
52
    enum PromptType {
50
    enum PromptType {
114
53
        PromptTypeQuestion,
51
        PromptTypeQuestion,
115
54
        PromptTypeSecret
52
        PromptTypeSecret
116
55
    };
53
    };
117
54
    Q_ENUM(PromptType)
118
56
55
119
57
    enum MessageType {
56
    enum MessageType {
120
58
        MessageTypeInfo,
57
        MessageTypeInfo,
121
59
        MessageTypeError
58
        MessageTypeError
122
60
    };
59
    };
123
60
    Q_ENUM(MessageType)
124
61
61
125
62
    explicit Greeter(QObject* parent=0);
62
    explicit Greeter(QObject* parent=0);
126
63
    virtual ~Greeter();
63
    virtual ~Greeter();
127
64
64
128
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
129
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-06-15 15:29:34 +0000
130
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2017-01-02 08:48:40 +0000
131
@@ -38,7 +38,6 @@
132
38
    QAbstractListModel(parent),
38
    QAbstractListModel(parent),
133
39
    d_ptr(new SessionsModelPrivate(this))
39
    d_ptr(new SessionsModelPrivate(this))
134
40
{
40
{
135
41
    Q_D(SessionsModel);
136
42
    m_roleNames = QAbstractListModel::roleNames();
41
    m_roleNames = QAbstractListModel::roleNames();
137
43
    m_roleNames[KeyRole] = "key";
42
    m_roleNames[KeyRole] = "key";
138
44
    m_roleNames[TypeRole] = "type";
43
    m_roleNames[TypeRole] = "type";
139
45
44
140
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
141
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2015-11-23 22:45:55 +0000
142
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2017-01-02 08:48:40 +0000
143
@@ -35,8 +35,6 @@
144
35
    {
35
    {
145
36
        Q_OBJECT
36
        Q_OBJECT
146
37
37
147
38
        Q_ENUMS(SessionModelRoles SessionType)
148
39
149
40
    public:
38
    public:
150
41
39
151
42
        enum SessionModelRoles {
40
        enum SessionModelRoles {
152
@@ -46,11 +44,13 @@
153
46
            IdRole = KeyRole, /** Deprecated */
44
            IdRole = KeyRole, /** Deprecated */
154
47
            TypeRole
45
            TypeRole
155
48
        };
46
        };
156
47
        Q_ENUM(SessionModelRoles)
157
49
48
158
50
        enum SessionType {
49
        enum SessionType {
159
51
            LocalSessions,
50
            LocalSessions,
160
52
            RemoteSessions
51
            RemoteSessions
161
53
        };
52
        };
162
53
        Q_ENUM(SessionType)
163
54
54
164
55
        explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
55
        explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
165
56
        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
56
        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
166
57
57
167
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h'
168
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-06-27 14:51:40 +0000
169
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2017-01-02 08:48:40 +0000
170
@@ -37,8 +37,6 @@
171
37
{
37
{
172
38
    Q_OBJECT
38
    Q_OBJECT
173
39
39
174
40
    Q_ENUMS(UserModelRoles)
175
41
176
42
public:
40
public:
177
43
    explicit UsersModel(QObject *parent = 0);
41
    explicit UsersModel(QObject *parent = 0);
178
44
    virtual ~UsersModel() = default;
42
    virtual ~UsersModel() = default;
179
@@ -53,6 +51,7 @@
180
53
                         BackgroundPathRole,
51
                         BackgroundPathRole,
181
54
                         UidRole
52
                         UidRole
182
55
    };
53
    };
183
54
    Q_ENUM(UserModelRoles)
184
56
55
185
57
    int rowCount(const QModelIndex &parent) const override;
56
    int rowCount(const QModelIndex &parent) const override;
186
58
    QVariant data(const QModelIndex &index, int role) const override;
57
    QVariant data(const QModelIndex &index, int role) const override;
187
59
58
188
=== modified file 'plugins/LightDM/SessionsModel.h'
189
--- plugins/LightDM/SessionsModel.h	2015-11-24 00:25:27 +0000
190
+++ plugins/LightDM/SessionsModel.h	2017-01-02 08:48:40 +0000
191
@@ -28,8 +28,6 @@
192
28
{
28
{
193
29
    Q_OBJECT
29
    Q_OBJECT
194
30
30
195
31
    Q_ENUMS(SessionModelRoles)
196
32
197
33
    Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
31
    Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
198
34
            WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
32
            WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
199
35
Q_SIGNALS:
33
Q_SIGNALS:
200
@@ -45,6 +43,7 @@
201
45
        TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
43
        TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
202
46
        IconRole
44
        IconRole
203
47
    };
45
    };
204
46
    Q_ENUM(SessionModelRoles)
205
48
47
206
49
    explicit SessionsModel(QObject* parent=nullptr);
48
    explicit SessionsModel(QObject* parent=nullptr);
207
50
49
208
51
50
209
=== modified file 'plugins/Lights/Lights.h'
210
--- plugins/Lights/Lights.h	2014-07-02 23:15:54 +0000
211
+++ plugins/Lights/Lights.h	2017-01-02 08:48:40 +0000
212
@@ -27,7 +27,6 @@
213
27
class Lights: public QObject
27
class Lights: public QObject
214
28
{
28
{
215
29
    Q_OBJECT
29
    Q_OBJECT
216
30
    Q_ENUMS(State)
217
31
    Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
30
    Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
218
32
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
31
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
219
33
    Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
32
    Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
220
@@ -38,6 +37,7 @@
221
38
        Off,
37
        Off,
222
39
        On,
38
        On,
223
40
    };
39
    };
224
40
    Q_ENUM(State)
225
41
41
226
42
    explicit Lights(QObject *parent = 0);
42
    explicit Lights(QObject *parent = 0);
227
43
    ~Lights();
43
    ~Lights();
228
44
44
229
=== modified file 'plugins/Powerd/Powerd.h'
230
--- plugins/Powerd/Powerd.h	2015-10-05 02:14:13 +0000
231
+++ plugins/Powerd/Powerd.h	2017-01-02 08:48:40 +0000
232
@@ -27,8 +27,6 @@
233
27
class Powerd: public QObject
27
class Powerd: public QObject
234
28
{
28
{
235
29
    Q_OBJECT
29
    Q_OBJECT
236
30
    Q_ENUMS(Status)
237
31
    Q_ENUMS(DisplayStateChangeReason)
238
32
    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
30
    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
239
33
31
240
34
public:
32
public:
241
@@ -41,11 +39,13 @@
242
41
        SnapDecision    = 5, // Display changed state due to snap decision prompt
39
        SnapDecision    = 5, // Display changed state due to snap decision prompt
243
42
        CallDone        = 6, // Display changed state due to voice call end
40
        CallDone        = 6, // Display changed state due to voice call end
244
43
    };
41
    };
245
42
    Q_ENUM(DisplayStateChangeReason)
246
44
43
247
45
    enum Status {
44
    enum Status {
248
46
        Off,
45
        Off,
249
47
        On,
46
        On,
250
48
    };
47
    };
251
48
    Q_ENUM(Status)
252
49
49
253
50
    explicit Powerd(QObject *parent = 0);
50
    explicit Powerd(QObject *parent = 0);
254
51
    ~Powerd();
51
    ~Powerd();
255
52
52
256
=== modified file 'plugins/UInput/uinput.h'
257
--- plugins/UInput/uinput.h	2015-11-25 14:58:55 +0000
258
+++ plugins/UInput/uinput.h	2017-01-02 08:48:40 +0000
259
@@ -27,7 +27,6 @@
260
27
class UInput : public QObject
27
class UInput : public QObject
261
28
{
28
{
262
29
    Q_OBJECT
29
    Q_OBJECT
263
30
    Q_ENUMS(Button)
264
31
30
265
32
public:
31
public:
266
33
    enum Button {
32
    enum Button {
267
@@ -35,6 +34,7 @@
268
35
        ButtonRight,
34
        ButtonRight,
269
36
        ButtonMiddle
35
        ButtonMiddle
270
37
    };
36
    };
271
37
    Q_ENUM(Button)
272
38
38
273
39
    explicit UInput(QObject *parent = nullptr);
39
    explicit UInput(QObject *parent = nullptr);
274
40
    ~UInput();
40
    ~UInput();
275
41
41
276
=== modified file 'plugins/Ubuntu/Gestures/Direction.h'
277
--- plugins/Ubuntu/Gestures/Direction.h	2015-12-10 10:22:25 +0000
278
+++ plugins/Ubuntu/Gestures/Direction.h	2017-01-02 08:48:40 +0000
279
@@ -26,7 +26,6 @@
280
26
 */
26
 */
281
27
class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
27
class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
282
28
    Q_OBJECT
28
    Q_OBJECT
283
29
    Q_ENUMS(Type)
284
30
29
285
31
public:
30
public:
286
32
    // Make sure it is kept synchronized with SDK UCSwipeArea::Direction
31
    // Make sure it is kept synchronized with SDK UCSwipeArea::Direction
287
@@ -38,6 +37,7 @@
288
38
        Horizontal, // Along the X axis, in any direction
37
        Horizontal, // Along the X axis, in any direction
289
39
        Vertical // Along the Y axis, in any direction
38
        Vertical // Along the Y axis, in any direction
290
40
    };
39
    };
291
40
    Q_ENUM(Type)
292
41
41
293
42
    Q_INVOKABLE static bool isHorizontal(Direction::Type type);
42
    Q_INVOKABLE static bool isHorizontal(Direction::Type type);
294
43
    Q_INVOKABLE static bool isVertical(Direction::Type type);
43
    Q_INVOKABLE static bool isVertical(Direction::Type type);
295
44
44
296
=== modified file 'plugins/Ubuntu/Gestures/TouchGestureArea.h'
297
--- plugins/Ubuntu/Gestures/TouchGestureArea.h	2016-08-29 23:35:35 +0000
298
+++ plugins/Ubuntu/Gestures/TouchGestureArea.h	2017-01-02 08:48:40 +0000
299
@@ -114,7 +114,6 @@
300
114
class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
114
class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
301
115
{
115
{
302
116
    Q_OBJECT
116
    Q_OBJECT
303
117
    Q_ENUMS(Status)
304
118
117
305
119
    Q_PROPERTY(int status READ status NOTIFY statusChanged)
118
    Q_PROPERTY(int status READ status NOTIFY statusChanged)
306
120
    Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
119
    Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
307
@@ -137,6 +136,7 @@
308
137
        Recognized,
136
        Recognized,
309
138
        Rejected
137
        Rejected
310
139
    };
138
    };
311
139
    Q_ENUM(Status)
312
140
    TouchGestureArea(QQuickItem* parent = nullptr);
140
    TouchGestureArea(QQuickItem* parent = nullptr);
313
141
    ~TouchGestureArea();
141
    ~TouchGestureArea();
314
142
142
315
143
143
316
=== modified file 'plugins/Unity/DashCommunicator/CMakeLists.txt'
317
--- plugins/Unity/DashCommunicator/CMakeLists.txt	2014-09-24 17:34:33 +0000
318
+++ plugins/Unity/DashCommunicator/CMakeLists.txt	2017-01-02 08:48:40 +0000
319
@@ -1,5 +1,6 @@
320
1
include_directories(
1
include_directories(
321
2
    ${CMAKE_CURRENT_SOURCE_DIR}
2
    ${CMAKE_CURRENT_SOURCE_DIR}
322
3
    ${CMAKE_CURRENT_BINARY_DIR}
323
3
    ${libunity8-private_SOURCE_DIR}
4
    ${libunity8-private_SOURCE_DIR}
324
4
)
5
)
325
5
6
326
6
7
327
=== modified file 'plugins/Unity/DashCommunicator/dashconnection.cpp'
328
--- plugins/Unity/DashCommunicator/dashconnection.cpp	2015-09-14 09:11:08 +0000
329
+++ plugins/Unity/DashCommunicator/dashconnection.cpp	2017-01-02 08:48:40 +0000
330
@@ -32,6 +32,7 @@
331
32
 */
32
 */
332
33
class AsyncDBusInterface : public QDBusAbstractInterface
33
class AsyncDBusInterface : public QDBusAbstractInterface
333
34
{
34
{
334
35
    Q_OBJECT
335
35
public:
36
public:
336
36
    AsyncDBusInterface(const QString &service, const QString &path,
37
    AsyncDBusInterface(const QString &service, const QString &path,
337
37
                       const QString &interface, const QDBusConnection &connection,
38
                       const QString &interface, const QDBusConnection &connection,
338
@@ -61,3 +62,5 @@
339
61
        dbusInterface()->asyncCall(QStringLiteral("SetCurrentScope"), index, animate, isSwipe);
62
        dbusInterface()->asyncCall(QStringLiteral("SetCurrentScope"), index, animate, isSwipe);
340
62
    }
63
    }
341
63
}
64
}
342
65
343
66
#include "dashconnection.moc"
344
64
67
345
=== modified file 'plugins/Unity/Indicators/indicators.h'
346
--- plugins/Unity/Indicators/indicators.h	2015-01-20 16:21:07 +0000
347
+++ plugins/Unity/Indicators/indicators.h	2017-01-02 08:48:40 +0000
348
@@ -27,13 +27,13 @@
349
27
{
27
{
350
28
    Q_OBJECT
28
    Q_OBJECT
351
29
public:
29
public:
352
30
    Q_ENUMS(ActionStates)
353
31
    enum ActionStates {
30
    enum ActionStates {
354
32
      Label           = 0x00,
31
      Label           = 0x00,
355
33
      IconSource      = 0x01,
32
      IconSource      = 0x01,
356
34
      AccessableName  = 0x02,
33
      AccessableName  = 0x02,
357
35
      Visible         = 0x03,
34
      Visible         = 0x03,
358
36
    };
35
    };
359
36
    Q_ENUM(ActionStates)
360
37
37
361
38
    ActionState(QObject*parent=0):QObject(parent) {}
38
    ActionState(QObject*parent=0):QObject(parent) {}
362
39
};
39
};
363
@@ -42,11 +42,11 @@
364
42
{
42
{
365
43
    Q_OBJECT
43
    Q_OBJECT
366
44
public:
44
public:
367
45
    Q_ENUMS(NetworkActionStates)
368
46
    enum NetworkActionStates {
45
    enum NetworkActionStates {
369
47
      Connection      = 0x01,
46
      Connection      = 0x01,
370
48
      SignalStrength  = 0x02,
47
      SignalStrength  = 0x02,
371
49
    };
48
    };
372
49
    Q_ENUM(NetworkActionStates)
373
50
50
374
51
    NetworkActionState(QObject*parent=0):QObject(parent) {}
51
    NetworkActionState(QObject*parent=0):QObject(parent) {}
375
52
};
52
};
376
@@ -55,13 +55,13 @@
377
55
{
55
{
378
56
    Q_OBJECT
56
    Q_OBJECT
379
57
public:
57
public:
380
58
    Q_ENUMS(NetworkConnectionStates)
381
59
    enum NetworkConnectionStates {
58
    enum NetworkConnectionStates {
382
60
      Initial         = 0x00,
59
      Initial         = 0x00,
383
61
      Activating      = 0x01,
60
      Activating      = 0x01,
384
62
      Activated       = 0x02,
61
      Activated       = 0x02,
385
63
      Deactivating    = 0x03,
62
      Deactivating    = 0x03,
386
64
    };
63
    };
387
64
    Q_ENUM(NetworkConnectionStates)
388
65
65
389
66
    NetworkConnection(QObject*parent=0):QObject(parent) {}
66
    NetworkConnection(QObject*parent=0):QObject(parent) {}
390
67
};
67
};
391
@@ -70,12 +70,12 @@
392
70
{
70
{
393
71
    Q_OBJECT
71
    Q_OBJECT
394
72
public:
72
public:
395
73
    Q_ENUMS(Roles)
396
74
    enum Roles {
73
    enum Roles {
397
75
        Identifier = 0,
74
        Identifier = 0,
398
76
        Position,
75
        Position,
399
77
        IndicatorProperties
76
        IndicatorProperties
400
78
    };
77
    };
401
78
    Q_ENUM(Roles)
402
79
79
403
80
    IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
80
    IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
404
81
};
81
};
405
@@ -84,7 +84,6 @@
406
84
{
84
{
407
85
    Q_OBJECT
85
    Q_OBJECT
408
86
public:
86
public:
409
87
    Q_ENUMS(Roles)
410
88
    enum Roles {
87
    enum Roles {
411
89
        Action  = Qt::DisplayRole + 1,
88
        Action  = Qt::DisplayRole + 1,
412
90
        Label,
89
        Label,
413
@@ -93,6 +92,7 @@
414
93
        hasSection,
92
        hasSection,
415
94
        hasSubMenu
93
        hasSubMenu
416
95
    };
94
    };
417
95
    Q_ENUM(Roles)
418
96
96
419
97
    FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
97
    FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
420
98
};
98
};
421
99
99
422
=== modified file 'plugins/Unity/Indicators/indicatorsmodel.h'
423
--- plugins/Unity/Indicators/indicatorsmodel.h	2015-11-21 22:41:41 +0000
424
+++ plugins/Unity/Indicators/indicatorsmodel.h	2017-01-02 08:48:40 +0000
425
@@ -32,7 +32,6 @@
426
32
class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
32
class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
427
33
{
33
{
428
34
    Q_OBJECT
34
    Q_OBJECT
429
35
    Q_ENUMS(Roles)
430
36
    Q_PROPERTY(int count READ count NOTIFY countChanged)
35
    Q_PROPERTY(int count READ count NOTIFY countChanged)
431
37
    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
36
    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
432
38
37
433
39
38
434
=== modified file 'plugins/Unity/InputInfo/qinputinfo.h'
435
--- plugins/Unity/InputInfo/qinputinfo.h	2015-10-02 14:23:01 +0000
436
+++ plugins/Unity/InputInfo/qinputinfo.h	2017-01-02 08:48:40 +0000
437
@@ -57,8 +57,6 @@
438
57
class QInputDevice : public QObject
57
class QInputDevice : public QObject
439
58
{
58
{
440
59
    Q_OBJECT
59
    Q_OBJECT
441
60
    Q_ENUMS(InputType)
442
61
    Q_FLAGS(InputType InputTypeFlags)
443
62
    friend class QInputDeviceManagerPrivate;
60
    friend class QInputDeviceManagerPrivate;
444
63
61
445
64
public:
62
public:
446
@@ -72,8 +70,9 @@
447
72
        Keyboard = 16,
70
        Keyboard = 16,
448
73
        Switch = 32
71
        Switch = 32
449
74
    };
72
    };
451
75
    Q_ENUMS(InputType)
73
    Q_FLAG(InputType)
452
76
    Q_DECLARE_FLAGS(InputTypeFlags, InputType)
74
    Q_DECLARE_FLAGS(InputTypeFlags, InputType)
453
75
    Q_FLAG(InputTypeFlags)
454
77
76
455
78
    explicit QInputDevice(QObject *parent = 0);
77
    explicit QInputDevice(QObject *parent = 0);
456
79
    QString name() const;
78
    QString name() const;
457
80
79
458
=== modified file 'plugins/Utils/appdrawerproxymodel.cpp'
459
--- plugins/Utils/appdrawerproxymodel.cpp	2016-11-28 13:27:22 +0000
460
+++ plugins/Utils/appdrawerproxymodel.cpp	2017-01-02 08:48:40 +0000
461
@@ -157,8 +157,8 @@
462
157
        QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();
157
        QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();
463
158
        allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());
158
        allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());
464
159
        bool found = false;
159
        bool found = false;
467
160
        Q_FOREACH (const QString currentWord, allWords) {
160
        Q_FOREACH (const QString &currentWord, allWords) {
468
161
            if (currentWord.toLower().startsWith(m_filterString.toLower())) {
161
            if (currentWord.startsWith(m_filterString, Qt::CaseInsensitive)) {
469
162
                found = true;
162
                found = true;
470
163
                break;
163
                break;
471
164
            }
164
            }
472
165
165
473
=== modified file 'plugins/Utils/appdrawerproxymodel.h'
474
--- plugins/Utils/appdrawerproxymodel.h	2016-11-28 10:17:22 +0000
475
+++ plugins/Utils/appdrawerproxymodel.h	2017-01-02 08:48:40 +0000
476
@@ -23,8 +23,6 @@
477
23
class AppDrawerProxyModel: public QSortFilterProxyModel
23
class AppDrawerProxyModel: public QSortFilterProxyModel
478
24
{
24
{
479
25
    Q_OBJECT
25
    Q_OBJECT
480
26
    Q_ENUMS(GroupBy)
481
27
    Q_ENUMS(SortBy)
482
28
    Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
26
    Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
483
29
    Q_PROPERTY(GroupBy group READ group WRITE setGroup NOTIFY groupChanged)
27
    Q_PROPERTY(GroupBy group READ group WRITE setGroup NOTIFY groupChanged)
484
30
    Q_PROPERTY(QString filterLetter READ filterLetter WRITE setFilterLetter NOTIFY filterLetterChanged)
28
    Q_PROPERTY(QString filterLetter READ filterLetter WRITE setFilterLetter NOTIFY filterLetterChanged)
485
@@ -38,10 +36,12 @@
486
38
        GroupByAll,
36
        GroupByAll,
487
39
        GroupByAToZ
37
        GroupByAToZ
488
40
    };
38
    };
489
39
    Q_ENUM(GroupBy)
490
41
    enum SortBy {
40
    enum SortBy {
491
42
        SortByAToZ,
41
        SortByAToZ,
492
43
        SortByUsage
42
        SortByUsage
493
44
    };
43
    };
494
44
    Q_ENUM(SortBy)
495
45
45
496
46
    AppDrawerProxyModel(QObject* parent = nullptr);
46
    AppDrawerProxyModel(QObject* parent = nullptr);
497
47
47
498
48
48
499
=== modified file 'plugins/Utils/easingcurve.h'
500
--- plugins/Utils/easingcurve.h	2015-11-20 15:01:39 +0000
501
+++ plugins/Utils/easingcurve.h	2017-01-02 08:48:40 +0000
502
@@ -36,7 +36,6 @@
503
36
class EasingCurve: public QObject
36
class EasingCurve: public QObject
504
37
{
37
{
505
38
    Q_OBJECT
38
    Q_OBJECT
506
39
    Q_ENUMS(QEasingCurve::Type)
507
40
    Q_PROPERTY(QEasingCurve::Type type READ type WRITE setType NOTIFY typeChanged)
39
    Q_PROPERTY(QEasingCurve::Type type READ type WRITE setType NOTIFY typeChanged)
508
41
    Q_PROPERTY(qreal period READ period WRITE setPeriod NOTIFY periodChanged)
40
    Q_PROPERTY(qreal period READ period WRITE setPeriod NOTIFY periodChanged)
509
42
    Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
41
    Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
510
43
42
511
=== modified file 'plugins/Utils/unitysortfilterproxymodelqml.h'
512
--- plugins/Utils/unitysortfilterproxymodelqml.h	2015-04-30 09:31:51 +0000
513
+++ plugins/Utils/unitysortfilterproxymodelqml.h	2017-01-02 08:48:40 +0000
514
@@ -38,6 +38,11 @@
515
38
    Q_INVOKABLE int mapRowToSource(int row);
38
    Q_INVOKABLE int mapRowToSource(int row);
516
39
    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
39
    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
517
40
40
518
41
    // Make the QSortFilterProxyModel variants also accessible
519
42
    using QSortFilterProxyModel::data;
520
43
    using QSortFilterProxyModel::mapFromSource;
521
44
    using QSortFilterProxyModel::mapToSource;
522
45
523
41
    /* getters */
46
    /* getters */
524
42
    int totalCount() const;
47
    int totalCount() const;
525
43
    bool invertMatch() const;
48
    bool invertMatch() const;
526
44
49
527
=== modified file 'plugins/Utils/windowstatestorage.h'
528
--- plugins/Utils/windowstatestorage.h	2016-12-01 18:35:18 +0000
529
+++ plugins/Utils/windowstatestorage.h	2017-01-02 08:48:40 +0000
530
@@ -25,7 +25,6 @@
531
25
class WindowStateStorage: public QObject
25
class WindowStateStorage: public QObject
532
26
{
26
{
533
27
    Q_OBJECT
27
    Q_OBJECT
534
28
    Q_ENUMS(WindowState)
535
29
public:
28
public:
536
30
    enum WindowState {
29
    enum WindowState {
537
31
        WindowStateNormal = 1 << 0,
30
        WindowStateNormal = 1 << 0,
538
@@ -42,10 +41,9 @@
539
42
        WindowStateMaximizedBottomRight = 1 << 11,
41
        WindowStateMaximizedBottomRight = 1 << 11,
540
43
        WindowStateRestored = 1 << 12
42
        WindowStateRestored = 1 << 12
541
44
    };
43
    };
542
44
    Q_ENUM(WindowState)
543
45
    Q_DECLARE_FLAGS(WindowStates, WindowState)
45
    Q_DECLARE_FLAGS(WindowStates, WindowState)
544
46
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
545
47
    Q_FLAG(WindowStates)
46
    Q_FLAG(WindowStates)
546
48
#endif
547
49
47
548
50
    WindowStateStorage(QObject *parent = 0);
48
    WindowStateStorage(QObject *parent = 0);
549
51
    virtual ~WindowStateStorage();
49
    virtual ~WindowStateStorage();
550
52
50
551
=== modified file 'plugins/Wizard/PageList.cpp'
552
--- plugins/Wizard/PageList.cpp	2016-07-18 13:33:45 +0000
553
+++ plugins/Wizard/PageList.cpp	2017-01-02 08:48:40 +0000
554
@@ -71,11 +71,8 @@
555
71
    // If there was a system update installed, skip until the last page to just greet the user
71
    // If there was a system update installed, skip until the last page to just greet the user
556
72
    QSettings settings;
72
    QSettings settings;
557
73
    if (settings.value(QStringLiteral("Wizard/SkipUntilFinishedPage")).toBool()) {
73
    if (settings.value(QStringLiteral("Wizard/SkipUntilFinishedPage")).toBool()) {
563
74
        const QString lastPage = m_pages.lastKey();
74
        while (m_pages.count() > 1) {
564
75
        Q_FOREACH(const QString &page, m_pages.keys()) {
75
            m_pages.erase(m_pages.begin());
560
76
            if (Q_UNLIKELY(page != lastPage)) {
561
77
                m_pages.remove(page);
562
78
            }
565
79
        }
76
        }
566
80
77
567
81
        // ... and reset it again for the next run
78
        // ... and reset it again for the next run
568
82
79
569
=== modified file 'plugins/Wizard/timezonemodel.h'
570
--- plugins/Wizard/timezonemodel.h	2016-03-02 23:03:06 +0000
571
+++ plugins/Wizard/timezonemodel.h	2017-01-02 08:48:40 +0000
572
@@ -27,7 +27,6 @@
573
27
    Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
27
    Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
574
28
    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
28
    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
575
29
    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
29
    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
576
30
    Q_ENUMS(Roles)
577
31
30
578
32
public:
31
public:
579
33
    explicit TimeZoneLocationModel(QObject *parent = nullptr);
32
    explicit TimeZoneLocationModel(QObject *parent = nullptr);
580
@@ -42,6 +41,7 @@
581
42
        LatitudeRole,
41
        LatitudeRole,
582
43
        LongitudeRole
42
        LongitudeRole
583
44
    };
43
    };
584
44
    Q_ENUM(Roles)
585
45
45
586
46
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
46
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
587
47
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
47
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
588
48
48
589
=== modified file 'src/libunity8-private/abstractdbusservicemonitor.h'
590
--- src/libunity8-private/abstractdbusservicemonitor.h	2014-12-17 13:34:22 +0000
591
+++ src/libunity8-private/abstractdbusservicemonitor.h	2017-01-02 08:48:40 +0000
592
@@ -30,7 +30,6 @@
593
30
class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
30
class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
594
31
{
31
{
595
32
    Q_OBJECT
32
    Q_OBJECT
596
33
    Q_ENUMS(Bus)
597
34
    Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
33
    Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
598
35
34
599
36
public:
35
public:
600
@@ -38,6 +37,7 @@
601
38
        SessionBus,
37
        SessionBus,
602
39
        SystemBus,
38
        SystemBus,
603
40
    };
39
    };
604
40
    Q_ENUM(Bus)
605
41
41
606
42
    explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,
42
    explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,
607
43
                                        const Bus bus = SessionBus,
43
                                        const Bus bus = SessionBus,
608
44
44
609
=== modified file 'tests/mocks/AccountsService/AccountsService.h'
610
--- tests/mocks/AccountsService/AccountsService.h	2016-08-30 13:43:08 +0000
611
+++ tests/mocks/AccountsService/AccountsService.h	2017-01-02 08:48:40 +0000
612
@@ -27,7 +27,6 @@
613
27
class AccountsService: public QObject
27
class AccountsService: public QObject
614
28
{
28
{
615
29
    Q_OBJECT
29
    Q_OBJECT
616
30
    Q_ENUMS(PasswordDisplayHint)
617
31
    Q_PROPERTY (QString user
30
    Q_PROPERTY (QString user
618
32
                READ user
31
                READ user
619
33
                WRITE setUser
32
                WRITE setUser
620
@@ -94,6 +93,7 @@
621
94
        Keyboard,
93
        Keyboard,
622
95
        Numeric
94
        Numeric
623
96
    };
95
    };
624
96
    Q_ENUM(PasswordDisplayHint)
625
97
97
626
98
    explicit AccountsService(QObject *parent = 0);
98
    explicit AccountsService(QObject *parent = 0);
627
99
99
628
100
100
629
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
630
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-07-28 15:34:29 +0000
631
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2017-01-02 08:48:40 +0000
632
@@ -173,7 +173,7 @@
633
173
173
634
174
void Greeter::sendAuthenticationComplete()
174
void Greeter::sendAuthenticationComplete()
635
175
{
175
{
637
176
    if (qgetenv("UNITY_TESTING").isEmpty()) {
176
    if (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {
638
177
        // simulate PAM's delay
177
        // simulate PAM's delay
639
178
        QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
178
        QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
640
179
    } else {
179
    } else {
641
180
180
642
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
643
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-07-28 15:34:29 +0000
644
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2017-01-02 08:48:40 +0000
645
@@ -42,8 +42,6 @@
646
42
    Q_PROPERTY(QString hostname READ hostname CONSTANT)
42
    Q_PROPERTY(QString hostname READ hostname CONSTANT)
647
43
    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
43
    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
648
44
44
649
45
    Q_ENUMS(PromptType MessageType)
650
46
651
47
    //Mock-only API for testing purposes
45
    //Mock-only API for testing purposes
652
48
    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
46
    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
653
49
47
654
@@ -52,11 +50,13 @@
655
52
        PromptTypeQuestion,
50
        PromptTypeQuestion,
656
53
        PromptTypeSecret
51
        PromptTypeSecret
657
54
    };
52
    };
658
53
    Q_ENUM(PromptType)
659
55
54
660
56
    enum MessageType {
55
    enum MessageType {
661
57
        MessageTypeInfo,
56
        MessageTypeInfo,
662
58
        MessageTypeError
57
        MessageTypeError
663
59
    };
58
    };
664
59
    Q_ENUM(MessageType)
665
60
60
666
61
    explicit Greeter(QObject* parent=0);
61
    explicit Greeter(QObject* parent=0);
667
62
    virtual ~Greeter();
62
    virtual ~Greeter();
668
63
63
669
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
670
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-07-13 20:24:24 +0000
671
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2017-01-02 08:48:40 +0000
672
@@ -33,7 +33,6 @@
673
33
    QAbstractListModel(parent),
33
    QAbstractListModel(parent),
674
34
    d_ptr(new SessionsModelPrivate(this))
34
    d_ptr(new SessionsModelPrivate(this))
675
35
{
35
{
676
36
    Q_D(SessionsModel);
677
37
    m_roleNames = QAbstractListModel::roleNames();
36
    m_roleNames = QAbstractListModel::roleNames();
678
38
    m_roleNames[KeyRole] = "key";
37
    m_roleNames[KeyRole] = "key";
679
39
    m_roleNames[TypeRole] = "type";
38
    m_roleNames[TypeRole] = "type";
680
40
39
681
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
682
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-07-13 20:24:24 +0000
683
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2017-01-02 08:48:40 +0000
684
@@ -29,8 +29,6 @@
685
29
    {
29
    {
686
30
        Q_OBJECT
30
        Q_OBJECT
687
31
31
688
32
        Q_ENUMS(SessionModelRoles SessionType)
689
33
690
34
    public:
32
    public:
691
35
33
692
36
        enum SessionModelRoles {
34
        enum SessionModelRoles {
693
@@ -40,11 +38,13 @@
694
40
            IdRole = KeyRole, /** Deprecated */
38
            IdRole = KeyRole, /** Deprecated */
695
41
            TypeRole
39
            TypeRole
696
42
        };
40
        };
697
41
        Q_ENUM(SessionModelRoles)
698
43
42
699
44
        enum SessionType {
43
        enum SessionType {
700
45
            LocalSessions,
44
            LocalSessions,
701
46
            RemoteSessions
45
            RemoteSessions
702
47
        };
46
        };
703
47
        Q_ENUM(SessionType)
704
48
48
705
49
        explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
49
        explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
706
50
        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
50
        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
707
51
51
708
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp'
709
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-05-24 22:11:21 +0000
710
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2017-01-02 08:48:40 +0000
711
@@ -34,8 +34,6 @@
712
34
    QAbstractListModel(parent),
34
    QAbstractListModel(parent),
713
35
    d_ptr(new UsersModelPrivate(this))
35
    d_ptr(new UsersModelPrivate(this))
714
36
{
36
{
715
37
    Q_D(UsersModel);
716
38
717
39
    // Extend roleNames (we want to keep the "display" role)
37
    // Extend roleNames (we want to keep the "display" role)
718
40
    QHash<int, QByteArray> roles = roleNames();
38
    QHash<int, QByteArray> roles = roleNames();
719
41
    roles[NameRole] = "name";
39
    roles[NameRole] = "name";
720
42
40
721
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h'
722
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-05-24 22:11:21 +0000
723
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2017-01-02 08:48:40 +0000
724
@@ -31,8 +31,6 @@
725
31
{
31
{
726
32
    Q_OBJECT
32
    Q_OBJECT
727
33
33
728
34
    Q_ENUMS(UserModelRoles)
729
35
730
36
    //Mock-only API for testing purposes
34
    //Mock-only API for testing purposes
731
37
    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
35
    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
732
38
36
733
@@ -53,6 +51,7 @@
734
53
                         BackgroundPathRole,
51
                         BackgroundPathRole,
735
54
                         UidRole
52
                         UidRole
736
55
    };
53
    };
737
54
    Q_ENUM(UserModelRoles)
738
56
55
739
57
    int rowCount(const QModelIndex &parent) const override;
56
    int rowCount(const QModelIndex &parent) const override;
740
58
    QVariant data(const QModelIndex &index, int role) const override;
57
    QVariant data(const QModelIndex &index, int role) const override;
741
59
58
742
=== modified file 'tests/mocks/Lights/Lights.h'
743
--- tests/mocks/Lights/Lights.h	2014-11-11 10:45:41 +0000
744
+++ tests/mocks/Lights/Lights.h	2017-01-02 08:48:40 +0000
745
@@ -23,7 +23,6 @@
746
23
class Lights: public QObject
23
class Lights: public QObject
747
24
{
24
{
748
25
    Q_OBJECT
25
    Q_OBJECT
749
26
    Q_ENUMS(State)
750
27
    Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
26
    Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
751
28
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
27
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
752
29
    Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
28
    Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
753
@@ -34,6 +33,7 @@
754
34
        Off,
33
        Off,
755
35
        On,
34
        On,
756
36
    };
35
    };
757
36
    Q_ENUM(State)
758
37
37
759
38
    explicit Lights(QObject *parent = 0);
38
    explicit Lights(QObject *parent = 0);
760
39
    ~Lights();
39
    ~Lights();
761
40
40
762
=== modified file 'tests/mocks/Powerd/Powerd.h'
763
--- tests/mocks/Powerd/Powerd.h	2015-09-02 13:42:24 +0000
764
+++ tests/mocks/Powerd/Powerd.h	2017-01-02 08:48:40 +0000
765
@@ -24,8 +24,6 @@
766
24
class Powerd: public QObject
24
class Powerd: public QObject
767
25
{
25
{
768
26
    Q_OBJECT
26
    Q_OBJECT
769
27
    Q_ENUMS(Status)
770
28
    Q_ENUMS(DisplayStateChangeReason)
771
29
    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
27
    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
772
30
28
773
31
public:
29
public:
774
@@ -35,11 +33,13 @@
775
35
        PowerKey        = 2, // Display changed state due to user pressing power key
33
        PowerKey        = 2, // Display changed state due to user pressing power key
776
36
        Proximity       = 3, // Display changed state due to proximity events
34
        Proximity       = 3, // Display changed state due to proximity events
777
37
    };
35
    };
778
36
    Q_ENUM(DisplayStateChangeReason)
779
38
37
780
39
    enum Status {
38
    enum Status {
781
40
        Off,
39
        Off,
782
41
        On,
40
        On,
783
42
    };
41
    };
784
42
    Q_ENUM(Status)
785
43
43
786
44
    explicit Powerd(QObject *parent = 0);
44
    explicit Powerd(QObject *parent = 0);
787
45
45
788
46
46
789
=== modified file 'tests/mocks/QMenuModel/dbus-enums.h'
790
--- tests/mocks/QMenuModel/dbus-enums.h	2014-11-14 17:47:00 +0000
791
+++ tests/mocks/QMenuModel/dbus-enums.h	2017-01-02 08:48:40 +0000
792
@@ -28,9 +28,6 @@
793
28
{
28
{
794
29
    Q_OBJECT
29
    Q_OBJECT
795
30
30
796
31
    Q_ENUMS(BusType)
797
32
    Q_ENUMS(ConnectionStatus)
798
33
799
34
public:
31
public:
800
35
    enum BusType {
32
    enum BusType {
801
36
        None = 0,
33
        None = 0,
802
@@ -38,12 +35,14 @@
803
38
        SystemBus,
35
        SystemBus,
804
39
        LastBusType
36
        LastBusType
805
40
    };
37
    };
806
38
    Q_ENUM(BusType)
807
41
39
808
42
    enum ConnectionStatus {
40
    enum ConnectionStatus {
809
43
        Disconnected = 0,
41
        Disconnected = 0,
810
44
        Connecting,
42
        Connecting,
811
45
        Connected
43
        Connected
812
46
    };
44
    };
813
45
    Q_ENUM(ConnectionStatus)
814
47
46
815
48
private:
47
private:
816
49
    DBusEnums() {}
48
    DBusEnums() {}
817
50
49
818
=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
819
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2014-10-07 10:28:59 +0000
820
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2017-01-02 08:48:40 +0000
821
@@ -220,9 +220,9 @@
822
220
{
220
{
823
221
    static QHash<QByteArray, int> roles;
221
    static QHash<QByteArray, int> roles;
824
222
    if (roles.isEmpty()) {
222
    if (roles.isEmpty()) {
828
223
        QHash<int, QByteArray> names = roleNames();
223
        const QHash<int, QByteArray> names = roleNames();
829
224
        Q_FOREACH (int role, names.keys())
224
        for(auto it = names.begin(); it != names.end(); ++it)
830
225
            roles.insert(names[role], role);
225
            roles.insert(it.value(), it.key());
831
226
    }
226
    }
832
227
227
833
228
    return this->data(this->index(row, 0), roles[role]);
228
    return this->data(this->index(row, 0), roles[role]);
834
229
229
835
=== modified file 'tests/mocks/QtMultimedia/mediaplayer.cpp'
836
--- tests/mocks/QtMultimedia/mediaplayer.cpp	2016-07-27 14:25:44 +0000
837
+++ tests/mocks/QtMultimedia/mediaplayer.cpp	2017-01-02 08:48:40 +0000
838
@@ -58,7 +58,7 @@
839
58
{
58
{
840
59
    qsrand(time(nullptr));
59
    qsrand(time(nullptr));
841
60
    m_timer.setInterval(100);
60
    m_timer.setInterval(100);
843
61
    connect(&m_timer, &QTimer::timeout, this, &MediaPlayer::timerEvent);
61
    connect(&m_timer, &QTimer::timeout, this, &MediaPlayer::processTimer);
844
62
62
845
63
    connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAboutToBeRemoved,
63
    connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAboutToBeRemoved,
846
64
            this, [this](const QUrl& source) {
64
            this, [this](const QUrl& source) {
847
@@ -188,7 +188,7 @@
848
188
    }
188
    }
849
189
}
189
}
850
190
190
852
191
void MediaPlayer::timerEvent()
191
void MediaPlayer::processTimer()
853
192
{
192
{
854
193
    if (m_position + m_timer.interval() < duration()) {
193
    if (m_position + m_timer.interval() < duration()) {
855
194
        m_position +=  m_timer.interval();
194
        m_position +=  m_timer.interval();
856
195
195
857
=== modified file 'tests/mocks/QtMultimedia/mediaplayer.h'
858
--- tests/mocks/QtMultimedia/mediaplayer.h	2016-07-27 14:25:44 +0000
859
+++ tests/mocks/QtMultimedia/mediaplayer.h	2017-01-02 08:48:40 +0000
860
@@ -45,17 +45,13 @@
861
45
    Q_PROPERTY(QObject *metaData READ metaData CONSTANT)
45
    Q_PROPERTY(QObject *metaData READ metaData CONSTANT)
862
46
    Q_PROPERTY(DeclarativePlaylist *playlist READ playlist WRITE setPlaylist NOTIFY playlistChanged)
46
    Q_PROPERTY(DeclarativePlaylist *playlist READ playlist WRITE setPlaylist NOTIFY playlistChanged)
863
47
47
864
48
    Q_ENUMS(PlaybackState)
865
49
    Q_ENUMS(AudioRole)
866
50
    Q_ENUMS(Availability)
867
51
    Q_ENUMS(Status)
868
52
    Q_ENUMS(Error)
869
53
public:
48
public:
870
54
    enum PlaybackState {
49
    enum PlaybackState {
871
55
        PlayingState,
50
        PlayingState,
872
56
        PausedState,
51
        PausedState,
873
57
        StoppedState
52
        StoppedState
874
58
    };
53
    };
875
54
    Q_ENUM(PlaybackState)
876
59
55
877
60
    enum AudioRole {
56
    enum AudioRole {
878
61
        UnknownRole,
57
        UnknownRole,
879
@@ -69,6 +65,7 @@
880
69
        SonificationRole,
65
        SonificationRole,
881
70
        GameRole
66
        GameRole
882
71
    };
67
    };
883
68
    Q_ENUM(AudioRole)
884
72
69
885
73
    enum Availability {
70
    enum Availability {
886
74
        Available,
71
        Available,
887
@@ -76,6 +73,7 @@
888
76
        Unavailable,
73
        Unavailable,
889
77
        ResourceMissing
74
        ResourceMissing
890
78
    };
75
    };
891
76
    Q_ENUM(Availability)
892
79
77
893
80
    enum Status {
78
    enum Status {
894
81
        UnknownStatus,
79
        UnknownStatus,
895
@@ -88,6 +86,7 @@
896
88
        EndOfMedia,
86
        EndOfMedia,
897
89
        InvalidMedia
87
        InvalidMedia
898
90
    };
88
    };
899
89
    Q_ENUM(Status)
900
91
90
901
92
    enum Error {
91
    enum Error {
902
93
        NoError,
92
        NoError,
903
@@ -97,6 +96,7 @@
904
97
        AccessDeniedError,
96
        AccessDeniedError,
905
98
        ServiceMissingError
97
        ServiceMissingError
906
99
    };
98
    };
907
99
    Q_ENUM(Error)
908
100
100
909
101
    explicit MediaPlayer(QObject *parent = nullptr);
101
    explicit MediaPlayer(QObject *parent = nullptr);
910
102
102
911
@@ -145,7 +145,7 @@
912
145
    void error(Error error, const QString &errorString);
145
    void error(Error error, const QString &errorString);
913
146
146
914
147
private Q_SLOTS:
147
private Q_SLOTS:
916
148
    void timerEvent();
148
    void processTimer();
917
149
149
918
150
private:
150
private:
919
151
    QUrl m_source;
151
    QUrl m_source;
920
152
152
921
=== modified file 'tests/mocks/UInput/mockuinput.h'
922
--- tests/mocks/UInput/mockuinput.h	2016-01-20 19:21:31 +0000
923
+++ tests/mocks/UInput/mockuinput.h	2017-01-02 08:48:40 +0000
924
@@ -27,7 +27,6 @@
925
27
class MockUInput : public QObject
27
class MockUInput : public QObject
926
28
{
28
{
927
29
    Q_OBJECT
29
    Q_OBJECT
928
30
    Q_ENUMS(Button)
929
31
30
930
32
public:
31
public:
931
33
    enum Button {
32
    enum Button {
932
@@ -35,6 +34,7 @@
933
35
        ButtonRight,
34
        ButtonRight,
934
36
        ButtonMiddle
35
        ButtonMiddle
935
37
    };
36
    };
936
37
    Q_ENUM(Button)
937
38
38
938
39
    explicit MockUInput(QObject *parent = nullptr);
39
    explicit MockUInput(QObject *parent = nullptr);
939
40
    ~MockUInput();
40
    ~MockUInput();
940
41
41
941
=== modified file 'tests/mocks/Ubuntu/Connectivity/networking-status.h'
942
--- tests/mocks/Ubuntu/Connectivity/networking-status.h	2014-09-01 10:25:28 +0000
943
+++ tests/mocks/Ubuntu/Connectivity/networking-status.h	2017-01-02 08:48:40 +0000
944
@@ -26,9 +26,6 @@
945
26
    Q_OBJECT
26
    Q_OBJECT
946
27
    Q_DISABLE_COPY(NetworkingStatus)
27
    Q_DISABLE_COPY(NetworkingStatus)
947
28
28
948
29
    Q_ENUMS(Limitations)
949
30
    Q_ENUMS(Status)
950
31
951
32
    Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
29
    Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
952
33
    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
30
    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
953
34
    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
31
    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
954
@@ -41,12 +38,14 @@
955
41
    enum Limitations {
38
    enum Limitations {
956
42
        Bandwith
39
        Bandwith
957
43
    };
40
    };
958
41
    Q_ENUM(Limitations)
959
44
42
960
45
    enum Status {
43
    enum Status {
961
46
        Offline,
44
        Offline,
962
47
        Connecting,
45
        Connecting,
963
48
        Online
46
        Online
964
49
    };
47
    };
965
48
    Q_ENUM(Status)
966
50
49
967
51
    QVector<Limitations> limitations() const;
50
    QVector<Limitations> limitations() const;
968
52
    Status status() const;
51
    Status status() const;
969
53
52
970
=== modified file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h'
971
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h	2016-01-07 20:59:28 +0000
972
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h	2017-01-02 08:48:40 +0000
973
@@ -22,7 +22,6 @@
974
22
class MockSecurityPrivacy : public QObject
22
class MockSecurityPrivacy : public QObject
975
23
{
23
{
976
24
    Q_OBJECT
24
    Q_OBJECT
977
25
    Q_ENUMS(SecurityType)
978
26
    Q_PROPERTY (SecurityType securityType
25
    Q_PROPERTY (SecurityType securityType
979
27
                READ getSecurityType
26
                READ getSecurityType
980
28
                NOTIFY securityTypeChanged)
27
                NOTIFY securityTypeChanged)
981
@@ -33,6 +32,7 @@
982
33
         Passcode,
32
         Passcode,
983
34
         Passphrase,
33
         Passphrase,
984
35
    };
34
    };
985
35
    Q_ENUM(SecurityType)
986
36
36
987
37
    MockSecurityPrivacy(QObject *parent = 0);
37
    MockSecurityPrivacy(QObject *parent = 0);
988
38
38
989
39
39
990
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
991
--- tests/mocks/Unity/Application/ApplicationInfo.h	2016-11-30 19:24:02 +0000
992
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2017-01-02 08:48:40 +0000
993
@@ -112,7 +112,7 @@
994
112
112
995
113
    //////
113
    //////
996
114
    // internal mock stuff
114
    // internal mock stuff
998
115
    void close();
115
    void close() override;
999
116
    void requestFocus();
116
    void requestFocus();
1000
117
117
1001
118
Q_SIGNALS:
118
Q_SIGNALS:
1002
119
119
1003
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
1004
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-11-30 19:24:02 +0000
1005
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2017-01-02 08:48:40 +0000
1006
@@ -216,7 +216,7 @@
1007
216
        Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
216
        Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
1008
217
    }
217
    }
1009
218
218
1011
219
    Q_FOREACH(QTouchEvent::TouchPoint touchPoint, event->touchPoints()) {
219
    Q_FOREACH(const QTouchEvent::TouchPoint &touchPoint, event->touchPoints()) {
1012
220
        QString id(touchPoint.id());
220
        QString id(touchPoint.id());
1013
221
        QVariantList list =  m_touchTrail[id].toList();
221
        QVariantList list =  m_touchTrail[id].toList();
1014
222
        list.append(QVariant::fromValue(touchPoint.pos()));
222
        list.append(QVariant::fromValue(touchPoint.pos()));
1015
223
223
1016
=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.h'
1017
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2015-04-30 09:31:51 +0000
1018
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2017-01-02 08:48:40 +0000
1019
@@ -25,7 +25,6 @@
1020
25
class FakeIndicatorsModel : public QAbstractListModel
25
class FakeIndicatorsModel : public QAbstractListModel
1021
26
{
26
{
1022
27
    Q_OBJECT
27
    Q_OBJECT
1023
28
    Q_ENUMS(Roles)
1024
29
    Q_PROPERTY(int count READ count NOTIFY countChanged)
28
    Q_PROPERTY(int count READ count NOTIFY countChanged)
1025
30
    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
29
    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
1026
31
    Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
30
    Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
1027
32
31
1028
=== modified file 'tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp'
1029
--- tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp	2016-04-04 07:49:06 +0000
1030
+++ tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp	2017-01-02 08:48:40 +0000
1031
@@ -43,10 +43,14 @@
1032
43
43
1033
44
void QInputDeviceManagerPrivate::removeDevice(const QString &path)
44
void QInputDeviceManagerPrivate::removeDevice(const QString &path)
1034
45
{
45
{
1036
46
    Q_FOREACH (const QString devicePath, deviceMap.keys()) {
46
    auto it = deviceMap.begin();
1037
47
    while (it != deviceMap.end()) {
1038
48
        const QString devicePath = it.key();
1039
47
        if (devicePath.contains(path)) {
49
        if (devicePath.contains(path)) {
1041
48
            deviceMap.remove(devicePath);
50
            it = deviceMap.erase(it);
1042
49
            Q_EMIT deviceRemoved(devicePath);
51
            Q_EMIT deviceRemoved(devicePath);
1043
52
        } else {
1044
53
            ++it;
1045
50
        }
54
        }
1046
51
    }
55
    }
1047
52
}
56
}
1048
53
57
1049
=== modified file 'tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp'
1050
--- tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2016-11-24 16:17:30 +0000
1051
+++ tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-01-02 08:48:40 +0000
1052
@@ -53,7 +53,7 @@
1053
53
    qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
53
    qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
1054
54
}
54
}
1055
55
55
1057
56
int MockAppDrawerModel::rowCount(const QModelIndex &parent) const
56
int MockAppDrawerModel::rowCount(const QModelIndex & /*parent*/) const
1058
57
{
57
{
1059
58
    return m_list.count();
58
    return m_list.count();
1060
59
}
59
}
1061
60
60
1062
=== modified file 'tests/mocks/Unity/Notifications/MockActionModel.h'
1063
--- tests/mocks/Unity/Notifications/MockActionModel.h	2015-09-23 11:21:07 +0000
1064
+++ tests/mocks/Unity/Notifications/MockActionModel.h	2017-01-02 08:48:40 +0000
1065
@@ -36,11 +36,11 @@
1066
36
    QVariant data(const QModelIndex &index, int role) const override;
36
    QVariant data(const QModelIndex &index, int role) const override;
1067
37
    QHash<int, QByteArray> roleNames() const override;
37
    QHash<int, QByteArray> roleNames() const override;
1068
38
38
1069
39
    Q_ENUMS(ActionsRoles)
1070
40
    enum ActionsRoles {
39
    enum ActionsRoles {
1071
41
        RoleActionLabel = Qt::UserRole + 1,
40
        RoleActionLabel = Qt::UserRole + 1,
1072
42
        RoleActionId    = Qt::UserRole + 2
41
        RoleActionId    = Qt::UserRole + 2
1073
43
    };
42
    };
1074
43
    Q_ENUM(ActionsRoles)
1075
44
    Q_INVOKABLE QVariant data(int row, int role) const;
44
    Q_INVOKABLE QVariant data(int row, int role) const;
1076
45
45
1077
46
    Q_INVOKABLE void append(const QString &id, const QString &label);
46
    Q_INVOKABLE void append(const QString &id, const QString &label);
1078
47
47
1079
=== modified file 'tests/mocks/Unity/Notifications/MockNotification.h'
1080
--- tests/mocks/Unity/Notifications/MockNotification.h	2016-08-19 13:41:07 +0000
1081
+++ tests/mocks/Unity/Notifications/MockNotification.h	2017-01-02 08:48:40 +0000
1082
@@ -30,7 +30,6 @@
1083
30
30
1084
31
class MockNotification : public QObject {
31
class MockNotification : public QObject {
1085
32
    Q_OBJECT
32
    Q_OBJECT
1086
33
    Q_ENUMS(Type Urgency)
1087
34
    Q_PROPERTY(QString summary READ getSummary WRITE setSummary NOTIFY summaryChanged)
33
    Q_PROPERTY(QString summary READ getSummary WRITE setSummary NOTIFY summaryChanged)
1088
35
    Q_PROPERTY(QString body READ getBody WRITE setBody NOTIFY bodyChanged)
34
    Q_PROPERTY(QString body READ getBody WRITE setBody NOTIFY bodyChanged)
1089
36
    Q_PROPERTY(int nid READ getID WRITE setID NOTIFY idChanged)
35
    Q_PROPERTY(int nid READ getID WRITE setID NOTIFY idChanged)
1090
@@ -48,7 +47,9 @@
1091
48
47
1092
49
public:
48
public:
1093
50
    enum Urgency { Low, Normal, Critical };
49
    enum Urgency { Low, Normal, Critical };
1094
50
    Q_ENUM(Urgency)
1095
51
    enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
51
    enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
1096
52
    Q_ENUM(Type)
1097
52
53
1098
53
Q_SIGNALS:
54
Q_SIGNALS:
1099
54
    void summaryChanged(const QString &summary);
55
    void summaryChanged(const QString &summary);
1100
55
56
1101
=== modified file 'tests/mocks/Unity/Screens/screens.cpp'
1102
--- tests/mocks/Unity/Screens/screens.cpp	2016-01-20 19:33:38 +0000
1103
+++ tests/mocks/Unity/Screens/screens.cpp	2017-01-02 08:48:40 +0000
1104
@@ -30,7 +30,7 @@
1105
30
    m_screenList.append(new Screen());
30
    m_screenList.append(new Screen());
1106
31
}
31
}
1107
32
32
1109
33
Screens::~Screens()
33
Screens::~Screens() noexcept
1110
34
{
34
{
1111
35
    qDeleteAll(m_screenList);
35
    qDeleteAll(m_screenList);
1112
36
    m_screenList.clear();
36
    m_screenList.clear();
1113
37
37
1114
=== modified file 'tests/mocks/Unity/Screens/screens.h'
1115
--- tests/mocks/Unity/Screens/screens.h	2015-12-03 11:45:52 +0000
1116
+++ tests/mocks/Unity/Screens/screens.h	2017-01-02 08:48:40 +0000
1117
@@ -25,7 +25,6 @@
1118
25
class Screens : public QAbstractListModel
25
class Screens : public QAbstractListModel
1119
26
{
26
{
1120
27
    Q_OBJECT
27
    Q_OBJECT
1121
28
    Q_ENUMS(OutputTypes)
1122
29
28
1123
30
    Q_PROPERTY(int count READ count NOTIFY countChanged)
29
    Q_PROPERTY(int count READ count NOTIFY countChanged)
1124
31
30
1125
@@ -52,6 +51,7 @@
1126
52
        TV,
51
        TV,
1127
53
        EDP
52
        EDP
1128
54
    };
53
    };
1129
54
    Q_ENUM(OutputTypes)
1130
55
55
1131
56
    explicit Screens(QObject *parent = 0);
56
    explicit Screens(QObject *parent = 0);
1132
57
    virtual ~Screens() noexcept;
57
    virtual ~Screens() noexcept;
1133
58
58
1134
=== modified file 'tests/mocks/Unity/fake_previewwidgetmodel.h'
1135
--- tests/mocks/Unity/fake_previewwidgetmodel.h	2014-05-13 14:05:47 +0000
1136
+++ tests/mocks/Unity/fake_previewwidgetmodel.h	2017-01-02 08:48:40 +0000
1137
@@ -23,7 +23,7 @@
1138
23
#include <QSharedPointer>
23
#include <QSharedPointer>
1139
24
#include <QVariantMap>
24
#include <QVariantMap>
1140
25
25
1142
26
class PreviewData;
26
struct PreviewData;
1143
27
27
1144
28
class PreviewWidgetModel : public unity::shell::scopes::PreviewWidgetModelInterface
28
class PreviewWidgetModel : public unity::shell::scopes::PreviewWidgetModelInterface
1145
29
{
29
{
1146
30
30
1147
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
1148
--- tests/mocks/Unity/fake_scopes.cpp	2016-06-07 03:33:35 +0000
1149
+++ tests/mocks/Unity/fake_scopes.cpp	2017-01-02 08:48:40 +0000
1150
@@ -272,7 +272,7 @@
1151
272
        beginInsertRows(QModelIndex(), index, index);
272
        beginInsertRows(QModelIndex(), index, index);
1152
273
        m_scopes.append(scope);
273
        m_scopes.append(scope);
1153
274
        endInsertRows();
274
        endInsertRows();
1155
275
        connect(scope, &Scope::favoriteChanged, [this, scope]{
275
        connect(scope, &Scope::favoriteChanged, this, [this, scope]{
1156
276
            setFavorite(scope->id(), scope->favorite());
276
            setFavorite(scope->id(), scope->favorite());
1157
277
        });
277
        });
1158
278
    }
278
    }
1159
279
279
1160
=== modified file 'tests/mocks/Unity/fake_scopesoverview.h'
1161
--- tests/mocks/Unity/fake_scopesoverview.h	2015-10-14 12:46:35 +0000
1162
+++ tests/mocks/Unity/fake_scopesoverview.h	2017-01-02 08:48:40 +0000
1163
@@ -34,6 +34,8 @@
1164
34
    void setSearchQuery(const QString& search_query) override;
34
    void setSearchQuery(const QString& search_query) override;
1165
35
    Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;
35
    Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;
1166
36
36
1167
37
    using Scope::setFavorite;
1168
38
1169
37
    // This is implementation detail
39
    // This is implementation detail
1170
38
    void setFavorite(Scope *scope, bool favorite);
40
    void setFavorite(Scope *scope, bool favorite);
1171
39
    void moveFavoriteTo(Scope *scope, int index);
41
    void moveFavoriteTo(Scope *scope, int index);
1172
40
42
1173
=== modified file 'tests/mocks/Utils/windowstatestorage.h'
1174
--- tests/mocks/Utils/windowstatestorage.h	2016-12-02 16:45:50 +0000
1175
+++ tests/mocks/Utils/windowstatestorage.h	2017-01-02 08:48:40 +0000
1176
@@ -25,7 +25,6 @@
1177
25
{
25
{
1178
26
    Q_OBJECT
26
    Q_OBJECT
1179
27
    Q_PROPERTY(QVariantMap geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
27
    Q_PROPERTY(QVariantMap geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
1180
28
    Q_ENUMS(WindowState)
1181
29
public:
28
public:
1182
30
    enum WindowState {
29
    enum WindowState {
1183
31
        WindowStateNormal = 1 << 0,
30
        WindowStateNormal = 1 << 0,
1184
@@ -42,10 +41,9 @@
1185
42
        WindowStateMaximizedBottomRight = 1 << 11,
41
        WindowStateMaximizedBottomRight = 1 << 11,
1186
43
        WindowStateRestored = 1 << 12
42
        WindowStateRestored = 1 << 12
1187
44
    };
43
    };
1188
44
    Q_ENUM(WindowState)
1189
45
    Q_DECLARE_FLAGS(WindowStates, WindowState)
45
    Q_DECLARE_FLAGS(WindowStates, WindowState)
1190
46
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
1191
47
    Q_FLAG(WindowStates)
46
    Q_FLAG(WindowStates)
1192
48
#endif
1193
49
47
1194
50
    WindowStateStorage(QObject *parent = 0);
48
    WindowStateStorage(QObject *parent = 0);
1195
51
49
1196
52
50
1197
=== modified file 'tests/mocks/libusermetrics/CMakeLists.txt'
1198
--- tests/mocks/libusermetrics/CMakeLists.txt	2013-12-17 14:56:25 +0000
1199
+++ tests/mocks/libusermetrics/CMakeLists.txt	2017-01-02 08:48:40 +0000
1200
@@ -10,6 +10,7 @@
1201
10
10
1202
11
include_directories(
11
include_directories(
1203
12
    ${CMAKE_SOURCE_DIR}/plugins/Utils
12
    ${CMAKE_SOURCE_DIR}/plugins/Utils
1204
13
    ${CMAKE_CURRENT_BINARY_DIR}
1205
13
)
14
)
1206
14
15
1207
15
set_target_properties(MockUserMetrics PROPERTIES
16
set_target_properties(MockUserMetrics PROPERTIES
1208
16
17
1209
=== modified file 'tests/mocks/libusermetrics/ColorTheme.cpp'
1210
--- tests/mocks/libusermetrics/ColorTheme.cpp	2013-06-14 19:35:25 +0000
1211
+++ tests/mocks/libusermetrics/ColorTheme.cpp	2017-01-02 08:48:40 +0000
1212
@@ -30,6 +30,8 @@
1213
30
30
1214
31
class ColorThemePrivate: QObject
31
class ColorThemePrivate: QObject
1215
32
{
32
{
1216
33
    Q_OBJECT
1217
34
1218
33
public:
35
public:
1219
34
    explicit ColorThemePrivate(ColorTheme *parent = 0);
36
    explicit ColorThemePrivate(ColorTheme *parent = 0);
1220
35
37
1221
@@ -126,3 +128,5 @@
1222
126
{
128
{
1223
127
    return d_ptr->m_end;
129
    return d_ptr->m_end;
1224
128
}
130
}
1225
131
1226
132
#include "ColorTheme.moc"
1227
129
133
1228
=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
1229
--- tests/mocks/libusermetrics/UserMetrics.cpp	2016-10-27 09:20:20 +0000
1230
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2017-01-02 08:48:40 +0000
1231
@@ -36,6 +36,7 @@
1232
36
36
1233
37
class Q_DECL_EXPORT UserMetricsData: public QObject
37
class Q_DECL_EXPORT UserMetricsData: public QObject
1234
38
{
38
{
1235
39
    Q_OBJECT
1236
39
public:
40
public:
1237
40
    explicit UserMetricsData(QObject *parent);
41
    explicit UserMetricsData(QObject *parent);
1238
41
42
1239
@@ -64,6 +65,7 @@
1240
64
65
1241
65
class UserMetricsPrivate: QObject
66
class UserMetricsPrivate: QObject
1242
66
{
67
{
1243
68
    Q_OBJECT
1244
67
public:
69
public:
1245
68
    explicit UserMetricsPrivate(UserMetrics *parent);
70
    explicit UserMetricsPrivate(UserMetrics *parent);
1246
69
71
1247
@@ -106,6 +108,7 @@
1248
106
108
1249
107
class UserMetricsDataPrivate: QObject
109
class UserMetricsDataPrivate: QObject
1250
108
{
110
{
1251
111
    Q_OBJECT
1252
109
public:
112
public:
1253
110
    explicit UserMetricsDataPrivate(UserMetricsData *parent);
113
    explicit UserMetricsDataPrivate(UserMetricsData *parent);
1254
111
114
1255
@@ -492,3 +495,5 @@
1256
492
{
495
{
1257
493
    return new UserMetrics();
496
    return new UserMetrics();
1258
494
}
497
}
1259
498
1260
499
#include "UserMetrics.moc"
1261
495
500
1262
=== modified file 'tests/plugins/Dash/horizontaljournaltest.cpp'
1263
--- tests/plugins/Dash/horizontaljournaltest.cpp	2016-11-28 09:57:06 +0000
1264
+++ tests/plugins/Dash/horizontaljournaltest.cpp	2017-01-02 08:48:40 +0000
1265
@@ -28,6 +28,7 @@
1266
28
#include "horizontaljournal.h"
28
#include "horizontaljournal.h"
1267
29
29
1268
30
class WidthModel : public QAbstractListModel {
30
class WidthModel : public QAbstractListModel {
1269
31
    Q_OBJECT
1270
31
public:
32
public:
1271
32
    QHash<int, QByteArray> roleNames() const override
33
    QHash<int, QByteArray> roleNames() const override
1272
33
    {
34
    {
1273
@@ -85,7 +86,7 @@
1274
85
    {
86
    {
1275
86
        QTRY_COMPARE(item->x(), x);
87
        QTRY_COMPARE(item->x(), x);
1276
87
        QTRY_COMPARE(item->y(), y);
88
        QTRY_COMPARE(item->y(), y);
1278
88
        QTRY_COMPARE(item->width(), model->stringList()[modelIndex].toDouble());
89
        QTRY_COMPARE(item->width(), model->stringList().at(modelIndex).toDouble());
1279
89
        QTRY_COMPARE(QQuickItemPrivate::get(item)->culled, !visible);
90
        QTRY_COMPARE(QQuickItemPrivate::get(item)->culled, !visible);
1280
90
    }
91
    }
1281
91
92
1282
92
93
1283
=== modified file 'tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp'
1284
--- tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp	2016-11-28 09:57:06 +0000
1285
+++ tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp	2017-01-02 08:48:40 +0000
1286
@@ -28,6 +28,7 @@
1287
28
28
1288
29
class StringListModel : public QAbstractListModel
29
class StringListModel : public QAbstractListModel
1289
30
{
30
{
1290
31
    Q_OBJECT
1291
31
public:
32
public:
1292
32
    StringListModel()
33
    StringListModel()
1293
33
    {
34
    {
1294
34
35
1295
=== modified file 'tests/plugins/Dash/organicgridtest.cpp'
1296
--- tests/plugins/Dash/organicgridtest.cpp	2016-11-28 09:57:06 +0000
1297
+++ tests/plugins/Dash/organicgridtest.cpp	2017-01-02 08:48:40 +0000
1298
@@ -28,6 +28,7 @@
1299
28
#include "organicgrid.h"
28
#include "organicgrid.h"
1300
29
29
1301
30
class DummyModel : public QAbstractListModel {
30
class DummyModel : public QAbstractListModel {
1302
31
    Q_OBJECT
1303
31
public:
32
public:
1304
32
    DummyModel() : m_count(0) {}
33
    DummyModel() : m_count(0) {}
1305
33
34
1306
34
35
1307
=== modified file 'tests/plugins/Dash/verticaljournaltest.cpp'
1308
--- tests/plugins/Dash/verticaljournaltest.cpp	2016-11-28 09:57:06 +0000
1309
+++ tests/plugins/Dash/verticaljournaltest.cpp	2017-01-02 08:48:40 +0000
1310
@@ -28,6 +28,7 @@
1311
28
#include "verticaljournal.h"
28
#include "verticaljournal.h"
1312
29
29
1313
30
class HeightModel : public QAbstractListModel {
30
class HeightModel : public QAbstractListModel {
1314
31
    Q_OBJECT
1315
31
public:
32
public:
1316
32
    QHash<int, QByteArray> roleNames() const override
33
    QHash<int, QByteArray> roleNames() const override
1317
33
    {
34
    {
1318
@@ -100,7 +101,7 @@
1319
100
        QTRY_COMPARE(item.m_modelIndex, modelIndex);
101
        QTRY_COMPARE(item.m_modelIndex, modelIndex);
1320
101
        QTRY_COMPARE(item.x(), x);
102
        QTRY_COMPARE(item.x(), x);
1321
102
        QTRY_COMPARE(item.y(), y);
103
        QTRY_COMPARE(item.y(), y);
1323
103
        QTRY_COMPARE(item.height(), model->stringList()[modelIndex].toDouble());
104
        QTRY_COMPARE(item.height(), model->stringList().at(modelIndex).toDouble());
1324
104
        QTRY_COMPARE(QQuickItemPrivate::get(item.m_item)->culled, !visible);
105
        QTRY_COMPARE(QQuickItemPrivate::get(item.m_item)->culled, !visible);
1325
105
    }
106
    }
1326
106
107
1327
107
108
1328
=== modified file 'tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp'
1329
--- tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2015-10-26 14:05:14 +0000
1330
+++ tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2017-01-02 08:48:40 +0000
1331
@@ -34,7 +34,6 @@
1332
34
    Q_OBJECT
34
    Q_OBJECT
1333
35
35
1334
36
private:
36
private:
1335
37
    LauncherModel *launcherModel;
1336
38
    QStringList users;
37
    QStringList users;
1337
39
    QHash<QString, QList<QVariantMap>> mockProperties;
38
    QHash<QString, QList<QVariantMap>> mockProperties;
1338
40
39
1339
41
40
1340
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
1341
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-12-07 11:30:41 +0000
1342
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2017-01-02 08:48:40 +0000
1343
@@ -101,7 +101,7 @@
1344
101
        }
101
        }
1345
102
        return nullptr;
102
        return nullptr;
1346
103
    }
103
    }
1348
104
    unityapi::ApplicationInfoInterface *findApplicationWithSurface(unityapi::MirSurfaceInterface* surface) const override {
104
    unityapi::ApplicationInfoInterface *findApplicationWithSurface(unityapi::MirSurfaceInterface* /*surface*/) const override {
1349
105
        return nullptr;
105
        return nullptr;
1350
106
    }
106
    }
1351
107
    unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) override { return nullptr; }
107
    unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) override { return nullptr; }
1352
@@ -501,14 +501,14 @@
1353
501
        QCOMPARE(spy.count(), 2);
501
        QCOMPARE(spy.count(), 2);
1354
502
502
1355
503
        QVariantList countEmissionArgs = spy.takeFirst();
503
        QVariantList countEmissionArgs = spy.takeFirst();
1358
504
        QCOMPARE(countEmissionArgs.at(0).value<QModelIndex>().row(), index);
504
        QCOMPARE(countEmissionArgs.at(0).toModelIndex().row(), index);
1359
505
        QCOMPARE(countEmissionArgs.at(1).value<QModelIndex>().row(), index);
505
        QCOMPARE(countEmissionArgs.at(1).toModelIndex().row(), index);
1360
506
        QVector<int> roles = countEmissionArgs.at(2).value<QVector<int> >();
506
        QVector<int> roles = countEmissionArgs.at(2).value<QVector<int> >();
1361
507
        QCOMPARE(roles.first(), (int)LauncherModel::RoleCount);
507
        QCOMPARE(roles.first(), (int)LauncherModel::RoleCount);
1362
508
508
1363
509
        QVariantList countVisibleEmissionArgs = spy.takeFirst();
509
        QVariantList countVisibleEmissionArgs = spy.takeFirst();
1366
510
        QCOMPARE(countVisibleEmissionArgs.at(0).value<QModelIndex>().row(), index);
510
        QCOMPARE(countVisibleEmissionArgs.at(0).toModelIndex().row(), index);
1367
511
        QCOMPARE(countVisibleEmissionArgs.at(1).value<QModelIndex>().row(), index);
511
        QCOMPARE(countVisibleEmissionArgs.at(1).toModelIndex().row(), index);
1368
512
        roles = countVisibleEmissionArgs.at(2).value<QVector<int> >();
512
        roles = countVisibleEmissionArgs.at(2).value<QVector<int> >();
1369
513
        QVERIFY(roles.contains(LauncherModel::RoleCountVisible));
513
        QVERIFY(roles.contains(LauncherModel::RoleCountVisible));
1370
514
        QVERIFY(roles.contains(LauncherModel::RoleAlerting));
514
        QVERIFY(roles.contains(LauncherModel::RoleAlerting));
1371
515
515
1372
=== modified file 'tests/uqmlscene/main.cpp'
1373
--- tests/uqmlscene/main.cpp	2016-05-26 13:15:35 +0000
1374
+++ tests/uqmlscene/main.cpp	2017-01-02 08:48:40 +0000
1375
@@ -243,7 +243,7 @@
1376
243
243
1377
244
static bool checkVersion(const QUrl &url)
244
static bool checkVersion(const QUrl &url)
1378
245
{
245
{
1380
246
    if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty())
246
    if (!qEnvironmentVariableIsEmpty("QMLSCENE_IMPORT_NAME"))
1381
247
        qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
247
        qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
1382
248
248
1383
249
    QString fileName = url.toLocalFile();
249
    QString fileName = url.toLocalFile();
1384
@@ -387,9 +387,9 @@
1385
387
    Options options;
387
    Options options;
1386
388
388
1387
389
    QStringList imports;
389
    QStringList imports;
1389
390
    QList<QPair<QString, QString> > bundles;
390
    QVector<QPair<QString, QString> > bundles;
1390
391
    for (int i = 1; i < argc; ++i) {
391
    for (int i = 1; i < argc; ++i) {
1392
392
        if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) {
392
        if (*argv[i] != '-' && QFileInfo::exists(QFile::decodeName(argv[i]))) {
1393
393
            options.file = QUrl::fromLocalFile(argv[i]);
393
            options.file = QUrl::fromLocalFile(argv[i]);
1394
394
        } else {
394
        } else {
1395
395
            const QString lowerArgument = QString::fromLatin1(argv[i]).toLower();
395
            const QString lowerArgument = QString::fromLatin1(argv[i]).toLower();
1396
396
396
1397
=== modified file 'tests/utils/modules/Unity/Test/testutil.cpp'
1398
--- tests/utils/modules/Unity/Test/testutil.cpp	2016-07-15 11:21:55 +0000
1399
+++ tests/utils/modules/Unity/Test/testutil.cpp	2017-01-02 08:48:40 +0000
1400
@@ -103,7 +103,7 @@
1401
103
void TestUtil::ensureTargetWindow()
103
void TestUtil::ensureTargetWindow()
1402
104
{
104
{
1403
105
    if (!m_targetWindow && !QGuiApplication::topLevelWindows().isEmpty())
105
    if (!m_targetWindow && !QGuiApplication::topLevelWindows().isEmpty())
1405
106
        m_targetWindow = QGuiApplication::topLevelWindows()[0];
106
        m_targetWindow = QGuiApplication::topLevelWindows().at(0);
1406
107
}
107
}
1407
108
108
1408
109
void TestUtil::ensureTouchDevice()
109
void TestUtil::ensureTouchDevice()
Status:	Merged
Approved by:	Michael Zanetti on 2017-01-03
Approved revision:	2748
Merged at revision:	2760
Proposed branch:	lp:~aacid/unity8/require_qt56
Merge into:	lp:unity8
Diff against target:	1408 lines (+123/-115) 68 files modified CMakeLists.txt (+7/-7) debian/control (+5/-5) plugins/AccountsService/AccountsService.h (+1/-1) plugins/Cursor/CursorImageInfo.cpp (+1/-2) plugins/Dash/abstractdashview.cpp (+1/-1) plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h (+2/-2) plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp (+0/-1) plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h (+2/-2) plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h (+1/-2) plugins/LightDM/SessionsModel.h (+1/-2) plugins/Lights/Lights.h (+1/-1) plugins/Powerd/Powerd.h (+2/-2) plugins/UInput/uinput.h (+1/-1) plugins/Ubuntu/Gestures/Direction.h (+1/-1) plugins/Ubuntu/Gestures/TouchGestureArea.h (+1/-1) plugins/Unity/DashCommunicator/CMakeLists.txt (+1/-0) plugins/Unity/DashCommunicator/dashconnection.cpp (+3/-0) plugins/Unity/Indicators/indicators.h (+5/-5) plugins/Unity/Indicators/indicatorsmodel.h (+0/-1) plugins/Unity/InputInfo/qinputinfo.h (+2/-3) plugins/Utils/appdrawerproxymodel.cpp (+2/-2) plugins/Utils/appdrawerproxymodel.h (+2/-2) plugins/Utils/easingcurve.h (+0/-1) plugins/Utils/unitysortfilterproxymodelqml.h (+5/-0) plugins/Utils/windowstatestorage.h (+1/-3) plugins/Wizard/PageList.cpp (+2/-5) plugins/Wizard/timezonemodel.h (+1/-1) src/libunity8-private/abstractdbusservicemonitor.h (+1/-1) tests/mocks/AccountsService/AccountsService.h (+1/-1) tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp (+1/-1) tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h (+2/-2) tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp (+0/-1) tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h (+2/-2) tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp (+0/-2) tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h (+1/-2) tests/mocks/Lights/Lights.h (+1/-1) tests/mocks/Powerd/Powerd.h (+2/-2) tests/mocks/QMenuModel/dbus-enums.h (+2/-3) tests/mocks/QMenuModel/unitymenumodel.cpp (+3/-3) tests/mocks/QtMultimedia/mediaplayer.cpp (+2/-2) tests/mocks/QtMultimedia/mediaplayer.h (+6/-6) tests/mocks/UInput/mockuinput.h (+1/-1) tests/mocks/Ubuntu/Connectivity/networking-status.h (+2/-3) tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h (+1/-1) tests/mocks/Unity/Application/ApplicationInfo.h (+1/-1) tests/mocks/Unity/Application/MirSurfaceItem.cpp (+1/-1) tests/mocks/Unity/Indicators/fakeindicatorsmodel.h (+0/-1) tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp (+6/-2) tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp (+1/-1) tests/mocks/Unity/Notifications/MockActionModel.h (+1/-1) tests/mocks/Unity/Notifications/MockNotification.h (+2/-1) tests/mocks/Unity/Screens/screens.cpp (+1/-1) tests/mocks/Unity/Screens/screens.h (+1/-1) tests/mocks/Unity/fake_previewwidgetmodel.h (+1/-1) tests/mocks/Unity/fake_scopes.cpp (+1/-1) tests/mocks/Unity/fake_scopesoverview.h (+2/-0) tests/mocks/Utils/windowstatestorage.h (+1/-3) tests/mocks/libusermetrics/CMakeLists.txt (+1/-0) tests/mocks/libusermetrics/ColorTheme.cpp (+4/-0) tests/mocks/libusermetrics/UserMetrics.cpp (+5/-0) tests/plugins/Dash/horizontaljournaltest.cpp (+2/-1) tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp (+1/-0) tests/plugins/Dash/organicgridtest.cpp (+1/-0) tests/plugins/Dash/verticaljournaltest.cpp (+2/-1) tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp (+0/-1) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+5/-5) tests/uqmlscene/main.cpp (+3/-3) tests/utils/modules/Unity/Test/testutil.cpp (+1/-1)
To merge this branch:	bzr merge lp:~aacid/unity8/require_qt56
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-12-23	Approve on 2017-01-03
Unity8 CI Bot	continuous-integration		Approve on 2017-01-02
Review via email: mp+313831@code.launchpad.net