Merge lp://qastaging/~marcustomlinson/unity-js-scopes/lp-1524200 into lp://qastaging/unity-js-scopes
Proposed by
Marcus Tomlinson
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Marcus Tomlinson | ||||
| Approved revision: | 118 | ||||
| Merged at revision: | 119 | ||||
| Proposed branch: | lp://qastaging/~marcustomlinson/unity-js-scopes/lp-1524200 | ||||
| Merge into: | lp://qastaging/unity-js-scopes | ||||
| Diff against target: |
102 lines (+33/-3) 5 files modified
qtc-templates/scope-js/src/data/displayName-settings.ini.in (+3/-3) src/bindings/src/addon.cc (+18/-0) src/bindings/src/common.cc (+7/-0) src/bindings/src/variant.cc (+4/-0) src/bindings/src/variant.h (+1/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~marcustomlinson/unity-js-scopes/lp-1524200 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alexandre Abreu | Pending | ||
|
Review via email:
|
|||
Commit message
Bind both the original Variant class and our bound version in order to support direct and indirect access to variants via the bindings
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Alexandre Abreu (abreu-alexandre) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:118
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://