Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/resolve_qpointer_data into lp:ubuntu-ui-toolkit/staging

  1. resolve_qpointer_data
  2. Merge into staging
Proposed by Zsombor Egri on 2015-11-27
Status: Merged
Approved by: Zoltan Balogh on 2015-11-27
Approved revision: 1728
Merged at revision: 1728
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/resolve_qpointer_data
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 12 lines (+1/-1)
1 file modified
src/Ubuntu/UbuntuGestures/touchregistry.cpp (+1/-1)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/resolve_qpointer_data
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-11-27
Zoltan Balogh (community) 2015-11-27 Approve on 2015-11-27
Review via email: mp+278766@code.launchpad.net

Commit Message

Resolve Trusty specific compiler issue not resolving QPointer data on connections.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Zoltan Balogh (bzoltan) :
review: Approve
PS Jenkins bot (ps-jenkins) :
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/UbuntuGestures/touchregistry.cpp'
2--- src/Ubuntu/UbuntuGestures/touchregistry.cpp 2015-11-17 11:48:09 +0000
3+++ src/Ubuntu/UbuntuGestures/touchregistry.cpp 2015-11-27 06:19:44 +0000
4@@ -256,7 +256,7 @@
5 candidateInfo.inactivityTimer = new CandidateInactivityTimer(id, candidate,
6 m_timerFactory->createTimer(),
7 this);
8- connect(candidateInfo.inactivityTimer, &CandidateInactivityTimer::candidateDefaulted,
9+ connect(candidateInfo.inactivityTimer.data(), &CandidateInactivityTimer::candidateDefaulted,
10 this, &TouchRegistry::rejectCandidateOwnerForTouch);
11
12 touchInfo->candidates.append(candidateInfo);

Subscribers

People subscribed via source and target branches