Merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1508418 into lp:qtcreator-plugin-ubuntu
Proposed by
Marcus Tomlinson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Benjamin Zeller | ||||
Approved revision: | 417 | ||||
Merged at revision: | 417 | ||||
Proposed branch: | lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1508418 | ||||
Merge into: | lp:qtcreator-plugin-ubuntu | ||||
Diff against target: |
110 lines (+25/-21) 4 files modified
share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp (+10/-10) share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp (+1/-0) share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp (+10/-10) share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py (+4/-1) |
||||
To merge this branch: | bzr merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1508418 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benjamin Zeller | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+275166@code.launchpad.net |
Commit message
Fixed scopes templates:
* OpenWeatherMap now requires an APPID key for all requests.
* Fixed "'cerr' was not declared in this scope" error in query.cpp.
* Fixed import in test-scope.py.
To post a comment you must log in.
PASSED: Continuous integration, rev:416 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- ci/566/ jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- wily-amd64- ci/27 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- wily-armhf- ci/27
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtcreator- plugin- ubuntu- ci/566/ rebuild
http://