Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/buildWarnings into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Fix build warnings

./src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h:48:38 error: non-virtual member function marked override hides virtual function
 QVariant data(int row, int role) override;
 ^

./src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp:1112:31 error: constexpr function never produces a constant expression [-Winvalid-constexpr]
static Q_DECL_CONSTEXPR float roundTextureCoord(float coord, size)
 ^
./src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp:1114:12 note: non-constexpr function roundf cannot be used in a constant expression
 return roundf(coord * size) / size;
 ^

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/981/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5207/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/981/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1010/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5209/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1010/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1227/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5210/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1227/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1214/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5211/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1214/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/652/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1214
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1227
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1010
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/981/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5212/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5211
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5210
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5209
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5207

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/652/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Thanks

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/984/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5220/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/984/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/985/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5222/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/985/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1217/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5224/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1217/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1231/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5227/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1231/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1013/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5228/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1013/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1014/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5229/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1014/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1230/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5230/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1230/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/653/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1217
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1230
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1013
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/984
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5231/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5224
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5230
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5228
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5220

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/653/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2061
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1219/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5232/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1219/rebuild

review: Approve (continuous-integration)

=== modified file 'app-launch-profiler/app-launch-profiler.pro'
--- app-launch-profiler/app-launch-profiler.pro	2016-03-12 17:38:04 +0000
+++ app-launch-profiler/app-launch-profiler.pro	2016-08-16 11:07:49 +0000
@@ -1,6 +1,7 @@
 TEMPLATE = app
 LIBS += -llttng-ust -ldl
 CONFIG += -I.
+QMAKE_CXXFLAGS += -Werror
 HEADERS += app-launch-tracepoints.h
 SOURCES += app-launch-tracepoints.c
 TARGET = app-launch-tracepoints

=== modified file 'app-launch-profiler/app-launch-tracepoints.c'
--- app-launch-profiler/app-launch-tracepoints.c	2015-09-22 12:06:28 +0000
+++ app-launch-profiler/app-launch-tracepoints.c	2016-08-16 11:07:49 +0000
@@ -28,6 +28,8 @@
 
 int main (int argc, char* argv[])
 {
+    #pragma unused(argc)
+    #pragma unused(argv)
     tracepoint(app,invokeApplauncher);
     return 0;
 }

=== modified file 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp'
--- src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.cpp	2016-08-16 11:07:49 +0000
@@ -224,21 +224,11 @@
     QHashIterator<int, QByteArray> i(roles);
     while (i.hasNext()) {
         i.next();
-        res.insert(i.value(), data(row, i.key()));
+        res.insert(i.value(), index(row, 0).data(i.key()));
     }
     return res;
 }
 
-QVariant
-QSortFilterProxyModelQML::data(int row, int role)
-{
-    if (sourceModel() == NULL) {
-        return QVariant();
-    }
-
-    return index(row, 0).data(role);
-}
-
 int
 QSortFilterProxyModelQML::count()
 {

=== modified file 'src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h'
--- src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h	2016-08-16 11:07:49 +0000
@@ -45,7 +45,6 @@
     explicit QSortFilterProxyModelQML(QObject *parent = 0);
 
     Q_INVOKABLE QVariantMap get(int row);
-    QVariant data(int row, int role);
     Q_INVOKABLE int count();
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 

=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp'
--- src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp	2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp	2016-08-16 11:07:49 +0000
@@ -1109,7 +1109,7 @@
 }
 
 // Gets the nearest boundary to coord in the texel grid of the given size.
-static Q_DECL_CONSTEXPR float roundTextureCoord(float coord, float size)
+static float roundTextureCoord(float coord, float size)
 {
     return roundf(coord * size) / size;
 }

=== modified file 'tests/unit/alarms/tst_alarms.cpp'
--- tests/unit/alarms/tst_alarms.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/alarms/tst_alarms.cpp	2016-08-16 11:07:49 +0000
@@ -537,8 +537,7 @@
         QVERIFY(containsAlarm(&alarm));
 
         // update alarm to occur 1h earlier
-        QDateTime date = alarm.date();
-        date.addSecs(-60);
+        QDateTime date = alarm.date().addSecs(-60);
         alarm.save();
         waitForUpdate();
         QVERIFY(containsAlarm(&alarm));

=== modified file 'tests/unit/page/tst_page.cpp'
--- tests/unit/page/tst_page.cpp	2014-03-28 17:02:52 +0000
+++ tests/unit/page/tst_page.cpp	2016-08-16 11:07:49 +0000
@@ -29,12 +29,8 @@
 {
     Q_OBJECT
 
-private:
-    QQuickView *view;
-
 public:
-    tst_Page() :
-        view(0)
+    tst_Page()
     {
     }