Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-update-sdcard-icon into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

Use SD card icon from official Suru theme

Use SD card icon from official Suru theme

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:171
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/9/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3194/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-utopic-amd64-ci/9/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/9/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-update-sdcard-icon]

172. By Stefano Verzegnassi on 2015-09-09

Merged trunk - fixed conflict

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/10/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3195/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-utopic-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/17/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/17

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-02-23 12:49:52 +0000
+++ debian/control	2015-09-09 14:06:14 +0000
@@ -28,6 +28,7 @@
 Architecture: any
 Depends: qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
          ${misc:Depends}
 Description: Document Viewer application
  Core Document Viewer application

=== removed file 'src/app/graphics/sd-card-symbolic.png'
Binary files src/app/graphics/sd-card-symbolic.png	2015-05-13 14:22:36 +0000 and src/app/graphics/sd-card-symbolic.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/app/qml/documentPage/DocumentGridDelegate.qml'
--- src/app/qml/documentPage/DocumentGridDelegate.qml	2015-08-04 16:01:37 +0000
+++ src/app/qml/documentPage/DocumentGridDelegate.qml	2015-09-09 14:06:14 +0000
@@ -65,7 +65,7 @@
         }
 
         visible: model.isFromExternalStorage
-        source: Qt.resolvedUrl("../../graphics/sd-card-symbolic.png")
+        name: "sdcard-symbolic"
     }
 
     // Document mimetype icon

=== modified file 'src/app/qml/documentPage/DocumentListDelegate.qml'
--- src/app/qml/documentPage/DocumentListDelegate.qml	2015-08-04 16:01:37 +0000
+++ src/app/qml/documentPage/DocumentListDelegate.qml	2015-09-09 14:06:14 +0000
@@ -124,7 +124,7 @@
 
                 Icon {
                     anchors.fill: parent
-                    source: Qt.resolvedUrl("../../graphics/sd-card-symbolic.png")
+                    name: "sdcard-symbolic"
                 }
             }
         }