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, 16 insertions, 12 deletions

diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp
index a333d2c0c7..cbcc0ff5b1 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp
@@ -102,23 +102,27 @@ QDeviceDiscovery::~QDeviceDiscovery()
 QStringList QDeviceDiscovery::scanConnectedDevices()
 {
     QStringList devices;
-
-    // check for input devices
-    QDir dir(QString::fromLatin1(QT_EVDEV_DEVICE_PATH));
+    QDir dir;
     dir.setFilter(QDir::System);
 
-    foreach (const QString &deviceFile, dir.entryList()) {
-        QString absoluteFilePath = dir.absolutePath() + QString::fromLatin1("/") + deviceFile;
-        if (checkDeviceType(absoluteFilePath))
-            devices << absoluteFilePath;
+    // check for input devices
+    if (m_types & Device_InputMask) {
+        dir.setPath(QString::fromLatin1(QT_EVDEV_DEVICE_PATH));
+        foreach (const QString &deviceFile, dir.entryList()) {
+            QString absoluteFilePath = dir.absolutePath() + QString::fromLatin1("/") + deviceFile;
+            if (checkDeviceType(absoluteFilePath))
+                devices << absoluteFilePath;
+        }
     }
 
     // check for drm devices
-    dir.setPath(QString::fromLatin1(QT_DRM_DEVICE_PATH));
-    foreach (const QString &deviceFile, dir.entryList()) {
-        QString absoluteFilePath = dir.absolutePath() + QString::fromLatin1("/") + deviceFile;
-        if (checkDeviceType(absoluteFilePath))
-            devices << absoluteFilePath;
+    if (m_types & Device_VideoMask) {
+        dir.setPath(QString::fromLatin1(QT_DRM_DEVICE_PATH));
+        foreach (const QString &deviceFile, dir.entryList()) {
+            QString absoluteFilePath = dir.absolutePath() + QString::fromLatin1("/") + deviceFile;
+            if (checkDeviceType(absoluteFilePath))
+                devices << absoluteFilePath;
+        }
     }
 
 #ifdef QT_QPA_DEVICE_DISCOVERY_DEBUG