Merge lp:~fboucault/camera-app/splashscreen into lp:camera-app

[Florian Boucault]

Added custom startup splash screen.

[Florian Boucault (fboucault)]

Blocked by https://bugs.launchpad.net/qtmir/+bug/1379819

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/camera-app-ci/297/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/113/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/113/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/113/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/479
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4044/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/791
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14514
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4373/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/297/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/camera-app/splashscreen]

406. By Florian Boucault on 2015-01-28

Merged from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:406
http://jenkins.qa.ubuntu.com/job/camera-app-ci/375/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/71/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/112
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/490/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/213
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17566
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/596/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/375/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:406
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/772/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/772/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/3/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

406. By Florian Boucault on 2015-01-28

Merged from trunk

405. By Florian Boucault on 2014-10-10

Added custom startup splash screen.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-09 09:28:57 +0000
+++ CMakeLists.txt	2015-01-28 14:46:35 +0000
@@ -88,7 +88,7 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
-file(GLOB QML_JS_FILES *.qml *.js)
+file(GLOB QML_JS_FILES *.qml *.js *.png)
 
 install(FILES ${QML_JS_FILES}
     DESTINATION ${CAMERA_APP_DIR}

=== modified file 'camera-app.desktop.in.in'
--- camera-app.desktop.in.in	2014-09-03 18:52:03 +0000
+++ camera-app.desktop.in.in	2015-01-28 14:46:35 +0000
@@ -10,3 +10,5 @@
 X-Ubuntu-Touch=true
 X-Ubuntu-Single-Instance=true
 X-Ubuntu-Default-Department-ID=accessories
+X-Ubuntu-Splash-Image=splashscreen.png
+X-Ubuntu-Splash-Color=#0D0D0D

=== added file '[e-mail]'
Binary files [e-mail]	1970-01-01 00:00:00 +0000 and [e-mail]	2015-01-28 14:46:35 +0000 differ