Ubuntu UI Toolkit

Merge lp:~aacid/ubuntu-ui-toolkit/fixSwipeAreaPrivateLeak into lp:ubuntu-ui-toolkit/staging

  1. fixSwipeAreaPrivateLeak
  2. Merge into staging
Proposed by Albert Astals Cid on 2015-12-09
Status: Merged
Approved by: Zoltan Balogh on 2015-12-09
Approved revision: 1733
Merged at revision: 1747
Proposed branch: lp:~aacid/ubuntu-ui-toolkit/fixSwipeAreaPrivateLeak
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 13 lines (+2/-1)
1 file modified
src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp (+2/-1)
To merge this branch: bzr merge lp:~aacid/ubuntu-ui-toolkit/fixSwipeAreaPrivateLeak
Reviewer Review Type Date Requested Status
Benjamin Zeller (community) 2015-12-09 Approve on 2015-12-09
PS Jenkins bot continuous-integration Approve on 2015-12-09
Review via email: mp+280039@code.launchpad.net

Commit Message

Fix memory leak in SwipeArea

SwipeAreaPrivate is not deleted directly so make it part of the qobject hierarchy so it's auto deleted on parent destruction

Description of the Change

Fix memory leak in SwipeArea

SwipeAreaPrivate is not deleted directly so make it part of the qobject hierarchy so it's auto deleted on parent destruction

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp'
2--- src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp 2015-11-13 08:15:59 +0000
3+++ src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp 2015-12-09 15:14:24 +0000
4@@ -940,7 +940,8 @@
5 }
6
7 UCSwipeAreaPrivate::UCSwipeAreaPrivate(UCSwipeArea *q)
8- : timeSource(new RealTimeSource)
9+ : QObject(q)
10+ , timeSource(new RealTimeSource)
11 , activeTouches(timeSource)
12 , q(q)
13 , recognitionTimer(nullptr)

Subscribers

People subscribed via source and target branches