Merge lp:~kissiel/checkbox/fix-1501511-standard-close-icon into lp:checkbox

[Maciej Kisielewski]

This MR makes checkbox use standard ubuntu icon for closing action on results screen.

[Nekhelesh Ramananthan (nik90)]

Yup that looks good :). Thnx for the fix.

review: Approve (code review)

[Sylvain Pineau (sylvain-pineau)]

The attempt to merge lp:~kissiel/checkbox/fix-1501511-standard-close-icon into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.07user 0.09system 0:04.32elapsed 3%CPU (0avgtext+0avgdata 10196maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8231minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 40.79user 12.29system 1:03.58elapsed 83%CPU (0avgtext+0avgdata 94848maxresident)k
[precise] (timing) 0inputs+19072outputs (0major+1590941minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.97user 0.16system 0:01.29elapsed 87%CPU (0avgtext+0avgdata 50416maxresident)k
[precise-testing] (timing) 0inputs+1976outputs (0major+27786minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 26.25user 0.33system 0:26.66elapsed 99%CPU (0avgtext+0avgdata 150464maxresident)k
[precise-testing] (timing) 0inputs+1320outputs (0major+40927minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.01user 0.00system 0:00.02elapsed 73%CPU (0avgtext+0avgdata 2180maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2489minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.00user 0.08system 0:01.11elapsed 98%CPU (0avgtext+0avgdata 45828maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14264minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.23user 0.05system 0:00.30elapsed 96%CPU (0avgtext+0avgdata 14500maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+6172minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 53.69user 1.32system 0:55.17elapsed 99%CPU (0avgtext+0avgdata 196576maxresident)k
[precise-testing] (timing) 0inputs+3256outputs (0major+199493minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 149.63user 0.73system 2:30.64elapsed 99%CPU (0avgtext+0avgdata 176840maxresident)k
[precise-testing] (timing) 0inputs+39856outputs (0major+53258minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: PASS
[precise...

[Sylvain Pineau (sylvain-pineau)]

With tarmac fixed, this branch should land now.

review: Approve

=== modified file 'checkbox-touch/components/ResultsPage.qml'
--- checkbox-touch/components/ResultsPage.qml	2015-09-04 13:15:26 +0000
+++ checkbox-touch/components/ResultsPage.qml	2015-10-05 13:22:22 +0000
@@ -48,7 +48,7 @@
     head {
         actions: [
             Action {
-                iconName: "window-close"
+                iconName: "close"
                 text: i18n.tr("Close")
                 onTriggered: endTesting();
             }