Merge branch 'Applications/18.08'

Conflicts:
	playermanager.cpp

playermanager.cpp

@@ -32,7 +32,7 @@
 #include <QTimer>
 #include <QUrl>
 
-#include <math.h>
+#include <algorithm>
 
 #include "playlistinterface.h"
 #include "playeradaptor.h"
@@ -321,12 +321,14 @@ void PlayerManager::back()
 
 void PlayerManager::volumeUp()
 {
-    setVolume(volume() + 0.04); // 4% up
+    const auto newVolume = std::min(m_output->volume() + 0.04, 1.0);
+    m_output->setVolume(newVolume); // 4% up
 }
 
 void PlayerManager::volumeDown()
 {
-    setVolume(volume() - 0.04); // 4% down
+    const auto newVolume = std::max(m_output->volume() - 0.04, 0.0);
+    m_output->setVolume(newVolume); // 4% down
 }
 
 void PlayerManager::setMuted(bool m)

systemtray.cpp

@@ -509,7 +509,7 @@ void SystemTray::scrollEvent(int delta, Qt::Orientation orientation)
     if(orientation == Qt::Horizontal)
         return;
 
-    switch(QApplication::keyboardModifiers()) {
+    switch(QApplication::queryKeyboardModifiers()) {
     case Qt::ShiftModifier:
         if(delta > 0)
             ActionCollection::action("volumeUp")->trigger();