Merge lp:~phablet-team/qtubuntu-camera/audio-role-staging into lp:qtubuntu-camera/staging

[Jim Hodapp]

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

[Florian Boucault (fboucault)]

Commit and description do not seem to correspond to what was done "Get rid of using the old QMediaPlayer::Alert role and use the new QAudio::NotificationRole for vivid and xenial."

review: Needs Fixing

[Florian Boucault (fboucault)]

No need for the debian changelog, it will be done automatically later

review: Needs Fixing

[lp:~phablet-team/qtubuntu-camera/audio-role-staging]

187. By Jim Hodapp on 2016-03-23

Remove no longer needed debian/changelog entry

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2016-02-09 08:54:12 +0000
+++ src/aalimagecapturecontrol.cpp	2016-03-23 12:41:33 +0000
@@ -50,11 +50,7 @@
 {
     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
 
     QObject::connect(&m_storageManager, &StorageManager::previewReady,
                      this, &AalImageCaptureControl::imageCaptured);