Merge lp://qastaging/~aacid/dee-qt/fixsetmodelsharedmodels into lp://qastaging/dee-qt/0.2

Proposed by Albert Astals Cid
Status: Merged
Approved by: Martin Mrazik
Approved revision: 71
Merged at revision: 67
Proposed branch: lp://qastaging/~aacid/dee-qt/fixsetmodelsharedmodels
Merge into: lp://qastaging/dee-qt/0.2
Diff against target: 342 lines (+220/-20)
7 files modified
CMakeLists.txt (+12/-1)
conversiontest.cpp (+5/-1)
debian/control (+1/-1)
debian/rules (+2/-0)
deelistmodel.cpp (+27/-17)
deelistmodeltest.cpp (+115/-0)
test-helper.cpp (+58/-0)
To merge this branch: bzr merge lp://qastaging/~aacid/dee-qt/fixsetmodelsharedmodels
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
Review via email: mp+135396@code.qastaging.launchpad.net

Commit message

Make setModel work for shared deemodels

Removes the isLocal member, don't need it and was checking for wrong stuff anyway

Description of the change

Make setModel work for shared deemodels

Removes the isLocal member, don't need it and was checking for wrong stuff anyway

To post a comment you must log in.
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

It works fine.
I tested with unity-2d and the home lens is still working correctly.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Reapproving, just forgot to set the commit message

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/16/console reported an error when processing this lp:~aacid/dee-qt/fixsetmodelsharedmodels branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee-qt/17/console reported an error when processing this lp:~aacid/dee-qt/fixsetmodelsharedmodels branch.
Not merging it.

71. By Albert Astals Cid

Use dbus-test-runner and make the helper a bit better

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches