Merge lp://qastaging/~marcustomlinson/unity-scopes-api/switch-to-net-cpp into lp://qastaging/unity-scopes-api
Proposed by
Marcus Tomlinson
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Paweł Stołowski | ||||||||
Approved revision: | 195 | ||||||||
Merged at revision: | 282 | ||||||||
Proposed branch: | lp://qastaging/~marcustomlinson/unity-scopes-api/switch-to-net-cpp | ||||||||
Merge into: | lp://qastaging/unity-scopes-api | ||||||||
Prerequisite: | lp://qastaging/~saviq/unity-scopes-api/fix-cross-wrap | ||||||||
Diff against target: |
1370 lines (+357/-698) 19 files modified
CMakeLists.txt (+27/-47) debian/control (+1/-1) include/unity/scopes/OnlineAccountClient.h (+1/-1) include/unity/scopes/internal/smartscopes/HttpClientInterface.h (+1/-1) include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h (+78/-0) include/unity/scopes/internal/smartscopes/HttpClientQt.h (+0/-91) include/unity/scopes/internal/smartscopes/HttpClientQtThread.h (+0/-100) src/scopes/internal/JsonCppNode.cpp (+4/-4) src/scopes/internal/RegistryObject.cpp (+1/-1) src/scopes/internal/smartscopes/CMakeLists.txt (+2/-31) src/scopes/internal/smartscopes/HttpClientNetCpp.cpp (+189/-0) src/scopes/internal/smartscopes/HttpClientQt.cpp (+0/-151) src/scopes/internal/smartscopes/HttpClientQtThread.cpp (+0/-186) src/scopes/internal/smartscopes/SSRegistryObject.cpp (+2/-2) src/scopes/internal/smartscopes/SmartScopesClient.cpp (+41/-30) test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp (+3/-3) test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py (+4/-1) test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+3/-2) valgrind-suppress (+0/-46) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~marcustomlinson/unity-scopes-api/switch-to-net-cpp | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michi Henning | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2015-01-15.
Commit message
Switch from QNetwork to net-cpp
Description of the change
Switch from QNetwork to net-cpp
This change has been on our backlog for some time now (Bug #1326816), but due to a recent issue we started experiencing with QNetwork (Bug #1409995) we are taking the opportunity now to make the switch over to net-cpp.
To post a comment you must log in.
PASSED: Continuous integration, rev:183 jenkins. qa.ubuntu. com/job/ unity-scopes- api-ci/ 514/ jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- amd64-ci/ 39 jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- armhf-ci/ 39 jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- armhf-ci/ 39/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- i386-ci/ 39
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- scopes- api-ci/ 514/rebuild
http://