Merge lp:~timo-jyrinki/qtubuntu-camera/support_new_audiorole_api into lp:qtubuntu-camera

[Timo Jyrinki]

Support the new AudioRole API in addition to the old (LP: #1493851) (LP: #1450346)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-vivid-i386-ci/22

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

Unmerged revisions

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2015-07-06 18:22:43 +0000
+++ src/aalimagecapturecontrol.cpp	2015-10-08 08:17:40 +0000
@@ -51,7 +51,11 @@
 {
     m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
     m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
     m_audioPlayer->setAudioRole(QMediaPlayer::AlertRole);
+#else
+    m_audioPlayer->setAudioRole(QAudio::NotificationRole);
+#endif
 }
 
 AalImageCaptureControl::~AalImageCaptureControl()