Merge lp://qastaging/~aacid/unity-scopes-shell/misc_fixes into lp://qastaging/unity-scopes-shell
Proposed by
Albert Astals Cid
Status: | Merged |
---|---|
Approved by: | Marcus Tomlinson |
Approved revision: | 356 |
Merged at revision: | 356 |
Proposed branch: | lp://qastaging/~aacid/unity-scopes-shell/misc_fixes |
Merge into: | lp://qastaging/unity-scopes-shell |
Diff against target: |
89 lines (+5/-8) 7 files modified
src/Unity/optionselectoroptions.h (+1/-1) src/Unity/overviewscope.cpp (+1/-1) src/Unity/settingsmodel.cpp (+0/-1) src/scope-harness/preview/preview-widget.h (+1/-1) tests/data/mock-scope-departments/mock-scope-departments.cpp (+1/-1) tests/data/mock-scope/mock-scope.cpp (+1/-1) tests/resultstest.cpp (+0/-2) |
To merge this branch: | bzr merge lp://qastaging/~aacid/unity-scopes-shell/misc_fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marcus Tomlinson (community) | Approve | ||
unity-api-1-bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Misc fixes
preview-widget.h
optionselectoro
Forward declare as struct as it is really a struct when defined
overviewscope.cpp
Save creating a list with all the values since foreach knows how to properly iterate a map/hash
settingsmodel.cpp
resultstest.cpp
Don't create an object we never use
mock-scope-
mock-scope.cpp
Mark function as override
To post a comment you must log in.
PASSED: Continuous integration, rev:356 /jenkins. canonical. com/unity- api-1/job/ lp-unity- scopes- shell-ci/ 9/ /jenkins. canonical. com/unity- api-1/job/ build/1299 /jenkins. canonical. com/unity- api-1/job/ build-0- fetch/1306 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1085 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1085/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/1085 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= zesty/1085/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1085 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1085/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/1085 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= zesty/1085/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1085 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1085/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/1085 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= zesty/1085/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/unity- api-1/job/ lp-unity- scopes- shell-ci/ 9/rebuild
https:/