Merge lp:~mandel/unity-scope-click/recompile-with-udm into lp:unity-scope-click/touch-15-04

Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 326
Merged at revision: 336
Proposed branch: lp:~mandel/unity-scope-click/recompile-with-udm
Merge into: lp:unity-scope-click/touch-15-04
Diff against target: 11 lines (+1/-0)
1 file modified
libclickscope/tests/mock_ubuntu_download_manager.h (+1/-0)
To merge this branch: bzr merge lp:~mandel/unity-scope-click/recompile-with-udm
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Unity API Team Pending
Review via email: mp+265586@code.launchpad.net

Commit message

Recompile the scope with the new UDM ABI.No need to bump the dep since we do not use any of the new methods.

Description of the change

Recompile the scope with the new UDM ABI.No need to bump the dep since we do not use any of the new methods.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
327. By CI Train Bot Account

Recompile the scope with the new UDM ABI.No need to bump the dep since we do not use any of the new methods.
Approved by: PS Jenkins bot

328. By CI Train Bot Account

Releasing 0.1.1+15.04.20150727-0ubuntu1

329. By dobey

Don't check refundability if price in details is 0 (or unspecified).
Initialize the price and rating to 0.0f in package details. Fixes: #1478026
Approved by: Pawel Stolowski

330. By CI Train Bot Account

Releasing 0.1.1+15.04.20150805-0ubuntu1

331. By dobey

Add missing setting of widget_id when rating from store scope.
Add tests. Fixes: #1485021
Approved by: PS Jenkins bot, Kyle Fazzari

332. By CI Train Bot Account

Releasing 0.1.1+15.04.20150817-0ubuntu1

333. By dobey

Only show Cancel Purchase button from within store scope for now.
Add more test coverage for conditionals. Fixes: #1486714
Approved by: Alejandro J. Cura, PS Jenkins bot

334. By dobey

Sign requests to CPI by default. Fixes: #1483866
Approved by: Alejandro J. Cura, PS Jenkins bot

335. By CI Train Bot Account

Releasing 0.1.1+15.04.20150914-0ubuntu1

336. By Manuel de la Peña

Recompile with the new udm.

337. By Manuel de la Peña

Add missing virtual property in the download mock.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libclickscope/tests/mock_ubuntu_download_manager.h'
2--- libclickscope/tests/mock_ubuntu_download_manager.h 2014-10-10 01:37:43 +0000
3+++ libclickscope/tests/mock_ubuntu_download_manager.h 2015-09-21 14:04:55 +0000
4@@ -72,6 +72,7 @@
5 MOCK_CONST_METHOD0(error, Error*());
6 MOCK_METHOD0(headers, QMap<QString, QString>());
7 MOCK_METHOD1(setHeaders, void(QMap<QString, QString>));
8+ MOCK_CONST_METHOD0(destinationApp, QString());
9 };
10
11 class MockError : public Ubuntu::DownloadManager::Error

Subscribers

People subscribed via source and target branches