Ubuntu UI Toolkit

Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/fix_gcc6_abs_breakage into lp:ubuntu-ui-toolkit/staging

  1. fix_gcc6_abs_breakage
  2. Merge into staging
Proposed by Timo Jyrinki
Status: Merged
Approved by: Cris Dywan
Approved revision: 2051
Merged at revision: 2051
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/fix_gcc6_abs_breakage
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 50 lines (+5/-3)
2 files modified
src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp (+2/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp (+3/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/fix_gcc6_abs_breakage
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+302279@code.launchpad.net

Commit message

Replace abs with qFabs due to GCC6 breakage

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2051
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/619/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1152
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1168
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/952
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/923
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4938/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4935
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4932
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4937
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4934

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

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Nice! Thanks!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp'
2--- src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp 2016-07-07 07:21:48 +0000
3+++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp 2016-08-08 12:00:28 +0000
4@@ -19,6 +19,7 @@
5 #include "uclistitem_p_p.h"
6 #include "ucunits_p.h"
7 #include "i18n_p.h"
8+#include <QtCore/QtMath>
9 #include <QtQml/QQmlInfo>
10 #include <QtQuick/private/qquickitem_p.h>
11 #include <QtQuick/private/qquickflickable_p.h>
12@@ -306,7 +307,7 @@
13
14 void ListItemDragArea::updateDraggedItem()
15 {
16- if (abs(fromIndex - toIndex) > 0) {
17+ if (qFabs(fromIndex - toIndex) > 0) {
18 UCListItem *targetItem = itemAt(item->x(), item->y() + item->height() / 2);
19 UCListItemPrivate::get(item)->dragHandler->update(targetItem);
20 }
21
22=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp'
23--- src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-07-07 08:42:42 +0000
24+++ src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-08-08 12:00:28 +0000
25@@ -21,6 +21,7 @@
26 #include "ucbottomedgeregion_p_p.h"
27 #include "ucbottomedgehint_p_p.h"
28 #include "ucstyleditembase_p_p.h"
29+#include <QtCore/QtMath>
30 #include <QtQml/QQmlEngine>
31 #include <QtGui/QScreen>
32 #include <QtQml/QQmlProperty>
33@@ -260,7 +261,7 @@
34
35 UCBottomEdge::DragDirection newDirection = dragDirection;
36 qreal delta = previousDistance - currentDistance;
37- bool deltaPassed = abs(delta) >= qApp->styleHints()->startDragDistance();
38+ bool deltaPassed = qFabs(delta) >= qApp->styleHints()->startDragDistance();
39 if (!deltaPassed) {
40 return;
41 }
42@@ -822,7 +823,7 @@
43 if (d->mousePressed) {
44 QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
45 qreal mouseItemY = mapFromScene(mouse->windowPos()).y();
46- qreal distance = abs(height() - mouseItemY);
47+ qreal distance = qFabs(height() - mouseItemY);
48 d->updateProgressionStates(distance);
49 }
50 break;

Subscribers

People subscribed via source and target branches