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

[Florian Boucault]

Unit tests: make tst_BottomEdgeIndicators::test_options conditional on the presence of Qt5.4

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:543
http://jenkins.qa.ubuntu.com/job/camera-app-ci/413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/109
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/195
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/758/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/470
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19239
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/611/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/901
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/901/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/unittests/tst_BottomEdgeIndicators.qml'
--- tests/unittests/tst_BottomEdgeIndicators.qml	2015-03-11 20:03:21 +0000
+++ tests/unittests/tst_BottomEdgeIndicators.qml	2015-03-27 14:53:23 +0000
@@ -103,6 +103,11 @@
     }
 
     function test_options(data) {
+        try {
+            Qt.createQmlObject("import QtQuick 2.4; Item {}", indicators);
+        } catch (e) {
+            skip("This test requires Qt 5.4");
+        }
         indicators.options = data.options;
         var emptyIndicatorsHint = findChild(indicators, "emptyIndicatorsHint");
         var indicatorsRow = findChild(indicators, "indicatorsRow");