Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/qnx-armv7le-qcc/qplatformdefs.h
	src/printsupport/kernel/qcups.cpp
	src/widgets/styles/qstyle.h
	tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp

Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267

1 files changed, 15 insertions, 0 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index e62b5dab82..b396dfdfa1 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -75,6 +75,7 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.lang.System;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -806,6 +807,13 @@ public class QtActivityDelegate
             c = composed;
         }
 
+        if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP
+            || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+            || keyCode == KeyEvent.KEYCODE_MUTE)
+            && System.getenv("QT_ANDROID_VOLUME_KEYS") == null) {
+            return false;
+        }
+
         m_lastChar = lc;
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             m_backKeyPressedSent = !m_keyboardIsVisible;
@@ -831,6 +839,13 @@ public class QtActivityDelegate
             }
         }
 
+        if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP
+            || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+            || keyCode == KeyEvent.KEYCODE_MUTE)
+            && System.getenv("QT_ANDROID_VOLUME_KEYS") == null) {
+            return false;
+        }
+
         if (keyCode == KeyEvent.KEYCODE_BACK && !m_backKeyPressedSent) {
             hideSoftwareKeyboard();
             setKeyboardVisibility(false, System.nanoTime());