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

Conflicts:
	configure
	mkspecs/macx-xcode/Info.plist.app
	mkspecs/macx-xcode/Info.plist.lib
	qmake/doc/qmake.qdocconf
	src/corelib/global/qglobal.h
	tests/auto/other/exceptionsafety/exceptionsafety.pro
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a

1 files changed, 33 insertions, 22 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index 4586ae2002..122fc55aad 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -57,6 +57,12 @@ import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MotionEvent;
 
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 public class QtNative
 {
     private static Activity m_activity = null;
@@ -337,28 +343,6 @@ public class QtNative
                 touchEnd(id,1);
         }
         //@ANDROID-5
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_UP:
-                mouseUp(id,(int) event.getX(), (int) event.getY());
-                break;
-
-            case MotionEvent.ACTION_DOWN:
-                mouseDown(id,(int) event.getX(), (int) event.getY());
-                m_oldx = (int) event.getX();
-                m_oldy = (int) event.getY();
-                break;
-
-            case MotionEvent.ACTION_MOVE:
-                int dx = (int) (event.getX() - m_oldx);
-                int dy = (int) (event.getY() - m_oldy);
-                if (Math.abs(dx) > m_moveThreshold || Math.abs(dy) > m_moveThreshold) {
-                    mouseMove(id, (int) event.getX(), (int) event.getY());
-                    m_oldx = (int) event.getX();
-                    m_oldy = (int) event.getY();
-                }
-                break;
-        }
     }
 
     static public void sendTrackballEvent(MotionEvent event, int id)
@@ -534,6 +518,33 @@ public class QtNative
         });
     }
 
+    private static byte[][] getSSLCertificates()
+    {
+        ArrayList<byte[]> certificateList = new ArrayList<byte[]>();
+
+        try {
+            TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            factory.init((KeyStore) null);
+
+            for (TrustManager manager : factory.getTrustManagers()) {
+                if (manager instanceof X509TrustManager) {
+                    X509TrustManager trustManager = (X509TrustManager) manager;
+
+                    for (X509Certificate certificate : trustManager.getAcceptedIssuers()) {
+                        byte buffer[] = certificate.getEncoded();
+                        certificateList.add(buffer);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            Log.e(QtTAG, "Failed to get certificates", e);
+        }
+
+        byte[][] certificateArray = new byte[certificateList.size()][];
+        certificateArray = certificateList.toArray(certificateArray);
+        return certificateArray;
+    }
+
     // screen methods
     public static native void setDisplayMetrics(int screenWidthPixels,
                                                 int screenHeightPixels,