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

[Florian Boucault]

Florian Boucault has proposed merging lp:~fboucault/camera-app/bottom_edge_test_conditional into lp:camera-app.

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

Requested reviews:
  Ubuntu Phablet Team (phablet-team)

For more details, see:
https://code.launchpad.net/~fboucault/camera-app/bottom_edge_test_conditional/+merge/254400
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~fboucault/camera-app/bottom_edge_test_conditional into lp:camera-app.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 648 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150327/f025dc28/attachment.diff>