1
=== modified file 'app-launch-profiler/app-launch-profiler.pro'
2
--- app-launch-profiler/app-launch-profiler.pro	2016-03-12 17:38:04 +0000
3
+++ app-launch-profiler/app-launch-profiler.pro	2016-08-16 11:07:49 +0000
4
@@ -1,6 +1,7 @@
5
1
TEMPLATE = app
1
TEMPLATE = app
6
2
LIBS += -llttng-ust -ldl
2
LIBS += -llttng-ust -ldl
7
3
CONFIG += -I.
3
CONFIG += -I.
8
4
QMAKE_CXXFLAGS += -Werror
9
4
HEADERS += app-launch-tracepoints.h
5
HEADERS += app-launch-tracepoints.h
10
5
SOURCES += app-launch-tracepoints.c
6
SOURCES += app-launch-tracepoints.c
11
6
TARGET = app-launch-tracepoints
7
TARGET = app-launch-tracepoints
12
7
8
13
=== modified file 'app-launch-profiler/app-launch-tracepoints.c'
14
--- app-launch-profiler/app-launch-tracepoints.c	2015-09-22 12:06:28 +0000
15
+++ app-launch-profiler/app-launch-tracepoints.c	2016-08-16 11:07:49 +0000
16
@@ -28,6 +28,8 @@
17
28
28
18
29
int main (int argc, char* argv[])
29
int main (int argc, char* argv[])
19
30
{
30
{
20
31
    #pragma unused(argc)
21
32
    #pragma unused(argv)
22
31
    tracepoint(app,invokeApplauncher);
33
    tracepoint(app,invokeApplauncher);
23
32
    return 0;
34
    return 0;
24
33
}
35
}
25
34
36
26
=== modified file 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp'
27
--- src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp	2016-07-07 07:21:48 +0000
28
+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp	2016-08-16 11:07:49 +0000
29
@@ -224,21 +224,11 @@
30
224
    QHashIterator<int, QByteArray> i(roles);
224
    QHashIterator<int, QByteArray> i(roles);
31
225
    while (i.hasNext()) {
225
    while (i.hasNext()) {
32
226
        i.next();
226
        i.next();
34
227
        res.insert(i.value(), data(row, i.key()));
227
        res.insert(i.value(), index(row, 0).data(i.key()));
35
228
    }
228
    }
36
229
    return res;
229
    return res;
37
230
}
230
}
38
231
231
39
232
QVariant
40
233
QSortFilterProxyModelQML::data(int row, int role)
41
234
{
42
235
    if (sourceModel() == NULL) {
43
236
        return QVariant();
44
237
    }
45
238
46
239
    return index(row, 0).data(role);
47
240
}
48
241
49
242
int
232
int
50
243
QSortFilterProxyModelQML::count()
233
QSortFilterProxyModelQML::count()
51
244
{
234
{
52
245
235
53
=== modified file 'src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h'
54
--- src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h	2016-07-07 07:21:48 +0000
55
+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h	2016-08-16 11:07:49 +0000
56
@@ -45,7 +45,6 @@
57
45
    explicit QSortFilterProxyModelQML(QObject *parent = 0);
45
    explicit QSortFilterProxyModelQML(QObject *parent = 0);
58
46
46
59
47
    Q_INVOKABLE QVariantMap get(int row);
47
    Q_INVOKABLE QVariantMap get(int row);
60
48
    QVariant data(int row, int role);
61
49
    Q_INVOKABLE int count();
48
    Q_INVOKABLE int count();
62
50
    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
49
    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
63
51
50
64
52
51
65
=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp'
66
--- src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp	2016-07-07 07:21:48 +0000
67
+++ src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp	2016-08-16 11:07:49 +0000
68
@@ -1109,7 +1109,7 @@
69
1109
}
1109
}
70
1110
1110
71
1111
// Gets the nearest boundary to coord in the texel grid of the given size.
1111
// Gets the nearest boundary to coord in the texel grid of the given size.
73
1112
static Q_DECL_CONSTEXPR float roundTextureCoord(float coord, float size)
1112
static float roundTextureCoord(float coord, float size)
74
1113
{
1113
{
75
1114
    return roundf(coord * size) / size;
1114
    return roundf(coord * size) / size;
76
1115
}
1115
}
77
1116
1116
78
=== modified file 'tests/unit/alarms/tst_alarms.cpp'
79
--- tests/unit/alarms/tst_alarms.cpp	2016-07-07 15:33:34 +0000
80
+++ tests/unit/alarms/tst_alarms.cpp	2016-08-16 11:07:49 +0000
81
@@ -537,8 +537,7 @@
82
537
        QVERIFY(containsAlarm(&alarm));
537
        QVERIFY(containsAlarm(&alarm));
83
538
538
84
539
        // update alarm to occur 1h earlier
539
        // update alarm to occur 1h earlier
87
540
        QDateTime date = alarm.date();
540
        QDateTime date = alarm.date().addSecs(-60);
86
541
        date.addSecs(-60);
88
542
        alarm.save();
541
        alarm.save();
89
543
        waitForUpdate();
542
        waitForUpdate();
90
544
        QVERIFY(containsAlarm(&alarm));
543
        QVERIFY(containsAlarm(&alarm));
91
545
544
92
=== modified file 'tests/unit/page/tst_page.cpp'
93
--- tests/unit/page/tst_page.cpp	2014-03-28 17:02:52 +0000
94
+++ tests/unit/page/tst_page.cpp	2016-08-16 11:07:49 +0000
95
@@ -29,12 +29,8 @@
96
29
{
29
{
97
30
    Q_OBJECT
30
    Q_OBJECT
98
31
31
99
32
private:
100
33
    QQuickView *view;
101
34
102
35
public:
32
public:
105
36
    tst_Page() :
33
    tst_Page()
104
37
        view(0)
106
38
    {
34
    {
107
39
    }
35
    }
108
40
36
Status:	Merged
Approved by:	Zoltan Balogh on 2016-08-16
Approved revision:	2061
Merged at revision:	2063
Proposed branch:	lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/buildWarnings
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	107 lines (+7/-20) 7 files modified app-launch-profiler/app-launch-profiler.pro (+1/-0) app-launch-profiler/app-launch-tracepoints.c (+2/-0) src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp (+1/-11) src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h (+0/-1) src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp (+1/-1) tests/unit/alarms/tst_alarms.cpp (+1/-2) tests/unit/page/tst_page.cpp (+1/-5)
To merge this branch:	bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/buildWarnings
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-08-16
Tim Peeters		2016-08-16	Approve on 2016-08-16
Review via email: mp+303004@code.launchpad.net