diff options
author | Cedric Chedaleux <cedric.chedaleux@orange.com> | 2014-02-03 11:33:55 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 13:46:46 +0100 |
commit | c6d3fe8873122701b9d223f68f25d8b478bed397 (patch) | |
tree | 385931e48ccb13de0a9cb7c1ae69697818c59449 /src/platformsupport/devicediscovery | |
parent | 2d67bf07fee5e0ad65b89030a440a3b73cb1d3d3 (diff) |
Checking input mask before scanning evdev devices
Adding device mask verification for static device discovery.
DRM devices are no longer scanned if mask is set to input devices only
Change-Id: Ibd2e77280c2d93c707ba7bdb84c4ae3cb0932178
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/platformsupport/devicediscovery')
-rw-r--r-- | src/platformsupport/devicediscovery/qdevicediscovery_static.cpp | 28 |
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 |