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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformintegration.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/sql/doc/src/sql-driver.qdoc
	src/widgets/widgets/qtoolbararealayout.cpp

Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e

1 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 1653c0ffdd..e997a49a25 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -325,6 +325,14 @@ namespace QtAndroid
         return m_qtTag;
     }
 
+    QString deviceName()
+    {
+        QString manufacturer = QJNIObjectPrivate::getStaticObjectField("android/os/Build", "MANUFACTURER", "Ljava/lang/String;").toString();
+        QString model = QJNIObjectPrivate::getStaticObjectField("android/os/Build", "MODEL", "Ljava/lang/String;").toString();
+
+        return manufacturer + QStringLiteral(" ") + model;
+    }
+
     int createSurface(AndroidSurfaceClient *client, const QRect &geometry, bool onTop)
     {
         QJNIEnvironmentPrivate env;
@@ -369,6 +377,7 @@ namespace QtAndroid
                                      x, y, w, h);
     }
 
+
     void destroySurface(int surfaceId)
     {
         QMutexLocker lock(&m_surfacesMutex);
@@ -385,7 +394,8 @@ namespace QtAndroid
                                      m_destroySurfaceMethodID,
                                      surfaceId);
     }
-}
+} // namespace QtAndroid
+
 
 static jboolean startQtAndroidPlugin(JNIEnv* /*env*/, jobject /*object*//*, jobject applicationAssetManager*/)
 {