Merge lp:~marcustomlinson/unity-scope-click/lp-1578283-2 into lp:unity-scope-click
Proposed by
Marcus Tomlinson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Paweł Stołowski | ||||
Approved revision: | 447 | ||||
Merged at revision: | 444 | ||||
Proposed branch: | lp:~marcustomlinson/unity-scope-click/lp-1578283-2 | ||||
Merge into: | lp:unity-scope-click | ||||
Diff against target: |
346 lines (+73/-34) 10 files modified
libclickscope/click/preview.cpp (+9/-2) libclickscope/click/preview.h (+3/-1) scope/clickapps/apps-query.cpp (+14/-5) scope/clickapps/apps-query.h (+6/-1) scope/clickapps/apps-scope.cpp (+8/-7) scope/clickapps/apps-scope.h (+5/-4) scope/clickstore/store-query.cpp (+11/-4) scope/clickstore/store-query.h (+4/-1) scope/clickstore/store-scope.cpp (+9/-7) scope/clickstore/store-scope.h (+4/-2) |
||||
To merge this branch: | bzr merge lp:~marcustomlinson/unity-scope-click/lp-1578283-2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Paweł Stołowski (community) | Approve | ||
Review via email: mp+294246@code.launchpad.net |
Commit message
Don't block search() and preview() calls while the Qt main loop spins up
To post a comment you must log in.
FAILED: Continuous integration, rev:446 jenkins. qa.ubuntu. com/job/ unity-scope- click-ci/ 743/ jenkins. qa.ubuntu. com/job/ unity-scope- click-wily- amd64-ci/ 147/console jenkins. qa.ubuntu. com/job/ unity-scope- click-wily- armhf-ci/ 143/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-click- ci/743/ rebuild
http://