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
=== modified file 'src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp 2016-07-07 07:21:48 +0000
+++ src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp 2016-08-08 12:00:28 +0000
@@ -19,6 +19,7 @@
19#include "uclistitem_p_p.h"19#include "uclistitem_p_p.h"
20#include "ucunits_p.h"20#include "ucunits_p.h"
21#include "i18n_p.h"21#include "i18n_p.h"
22#include <QtCore/QtMath>
22#include <QtQml/QQmlInfo>23#include <QtQml/QQmlInfo>
23#include <QtQuick/private/qquickitem_p.h>24#include <QtQuick/private/qquickitem_p.h>
24#include <QtQuick/private/qquickflickable_p.h>25#include <QtQuick/private/qquickflickable_p.h>
@@ -306,7 +307,7 @@
306307
307void ListItemDragArea::updateDraggedItem()308void ListItemDragArea::updateDraggedItem()
308{309{
309 if (abs(fromIndex - toIndex) > 0) {310 if (qFabs(fromIndex - toIndex) > 0) {
310 UCListItem *targetItem = itemAt(item->x(), item->y() + item->height() / 2);311 UCListItem *targetItem = itemAt(item->x(), item->y() + item->height() / 2);
311 UCListItemPrivate::get(item)->dragHandler->update(targetItem);312 UCListItemPrivate::get(item)->dragHandler->update(targetItem);
312 }313 }
313314
=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp'
--- src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-08-08 12:00:28 +0000
@@ -21,6 +21,7 @@
21#include "ucbottomedgeregion_p_p.h"21#include "ucbottomedgeregion_p_p.h"
22#include "ucbottomedgehint_p_p.h"22#include "ucbottomedgehint_p_p.h"
23#include "ucstyleditembase_p_p.h"23#include "ucstyleditembase_p_p.h"
24#include <QtCore/QtMath>
24#include <QtQml/QQmlEngine>25#include <QtQml/QQmlEngine>
25#include <QtGui/QScreen>26#include <QtGui/QScreen>
26#include <QtQml/QQmlProperty>27#include <QtQml/QQmlProperty>
@@ -260,7 +261,7 @@
260261
261 UCBottomEdge::DragDirection newDirection = dragDirection;262 UCBottomEdge::DragDirection newDirection = dragDirection;
262 qreal delta = previousDistance - currentDistance;263 qreal delta = previousDistance - currentDistance;
263 bool deltaPassed = abs(delta) >= qApp->styleHints()->startDragDistance();264 bool deltaPassed = qFabs(delta) >= qApp->styleHints()->startDragDistance();
264 if (!deltaPassed) {265 if (!deltaPassed) {
265 return;266 return;
266 }267 }
@@ -822,7 +823,7 @@
822 if (d->mousePressed) {823 if (d->mousePressed) {
823 QMouseEvent *mouse = static_cast<QMouseEvent*>(event);824 QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
824 qreal mouseItemY = mapFromScene(mouse->windowPos()).y();825 qreal mouseItemY = mapFromScene(mouse->windowPos()).y();
825 qreal distance = abs(height() - mouseItemY);826 qreal distance = qFabs(height() - mouseItemY);
826 d->updateProgressionStates(distance);827 d->updateProgressionStates(distance);
827 }828 }
828 break;829 break;

Subscribers

People subscribed via source and target branches