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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 71
Merged at revision: 66
Proposed branch: lp://qastaging/~aacid/dee-qt/support_arrays_and_tuples
Merge into: lp://qastaging/dee-qt/0.2
Diff against target: 157 lines (+110/-3)
3 files modified
CMakeLists.txt (+8/-1)
conversiontest.cpp (+89/-0)
deelistmodel.cpp (+13/-2)
To merge this branch: bzr merge lp://qastaging/~aacid/dee-qt/support_arrays_and_tuples
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Florian Boucault Pending
Review via email: mp+133677@code.qastaging.launchpad.net

Commit message

Add support for G_VARIANT_CLASS_ARRAY and G_VARIANT_CLASS_TUPLE

Description of the change

Add support for G_VARIANT_CLASS_ARRAY and G_VARIANT_CLASS_TUPLE

To post a comment you must log in.
Revision history for this message
Unity Merger (unity-merger) wrote :

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

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

Reapproving since the only change from the last approval is the addition of the dbus-test-runner as instructed by Florian/Didier on IRC

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

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

Revision history for this message
Michal Hruby (mhr3) wrote :

134 + array << QVariantFromGVariant(g_variant_get_child_value(value, i));

Unless QVariantFromGVariant is stealing references, you're leaking a variant here.

review: Needs Fixing
69. By Albert Astals Cid

Fix memory leak as reported by Michal Hruby

70. By Albert Astals Cid

For the test

71. By Albert Astals Cid

Really fix the problem with the test

Revision history for this message
Michal Hruby (mhr3) :
review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

Ok, now that Michal is happy with the memory leak fix and i think i have finally fixed the problem with the test not running in jenkins lets try to merge again

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