Merge lp://qastaging/~marcustomlinson/unity-scopes-api/switch-to-net-cpp-rtm into lp://qastaging/unity-scopes-api/rtm-14.09
Proposed by
Marcus Tomlinson
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Michi Henning | ||||
| Approved revision: | 267 | ||||
| Merged at revision: | 262 | ||||
| Proposed branch: | lp://qastaging/~marcustomlinson/unity-scopes-api/switch-to-net-cpp-rtm | ||||
| Merge into: | lp://qastaging/unity-scopes-api/rtm-14.09 | ||||
| Prerequisite: | lp://qastaging/~marcustomlinson/unity-scopes-api/lp-1410125-rtm | ||||
| Diff against target: |
1357 lines (+356/-694) 19 files modified
CMakeLists.txt (+28/-45) 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/-94) include/unity/scopes/internal/smartscopes/HttpClientQtThread.h (+0/-103) 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/-147) src/scopes/internal/smartscopes/HttpClientQtThread.cpp (+0/-180) src/scopes/internal/smartscopes/SSRegistryObject.cpp (+2/-2) src/scopes/internal/smartscopes/SmartScopesClient.cpp (+39/-31) 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/-3) valgrind-suppress (+0/-46) |
||||
| To merge this branch: | bzr merge lp://qastaging/~marcustomlinson/unity-scopes-api/switch-to-net-cpp-rtm | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michi Henning (community) | Approve | ||
|
Review via email:
|
|||
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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looking good, thanks!