Merge lp:~marcustomlinson/unity-js-scopes/lp-1524200 into lp:unity-js-scopes
Proposed by
Marcus Tomlinson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Marcus Tomlinson | ||||
Approved revision: | 118 | ||||
Merged at revision: | 119 | ||||
Proposed branch: | lp:~marcustomlinson/unity-js-scopes/lp-1524200 | ||||
Merge into: | lp: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:~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: mp+279977@code.launchpad.net |
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.
PASSED: Continuous integration, rev:118 jenkins. qa.ubuntu. com/job/ unity-js- scopes- ci/61/ jenkins. qa.ubuntu. com/job/ unity-js- scopes- wily-amd64- ci/62 jenkins. qa.ubuntu. com/job/ unity-js- scopes- wily-armhf- ci/62 jenkins. qa.ubuntu. com/job/ unity-js- scopes- wily-armhf- ci/62/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-js- scopes- wily-i386- ci/61
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- js-scopes- ci/61/rebuild
http://