diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 15:56:19 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-21 16:47:42 +0000 |
| commit | abbc5ecc5e93c2d147b8730f7d82200900580c75 (patch) | |
| tree | 533453e3d302cdf2fe1950b2795fa2a3f8bd7089 /src/platformsupport/devicediscovery/qdevicediscovery_static.cpp | |
| parent | 207694fbcb7a68f7145b86e787d8e51cc3bb5aa2 (diff) | |
| parent | eaec2b664aa2c3cbca13b425901888468a4652a1 (diff) | |
| download | qtbase-abbc5ecc5e93c2d147b8730f7d82200900580c75.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/platformsupport/devicediscovery/qdevicediscovery_static.cpp')
| -rw-r--r-- | src/platformsupport/devicediscovery/qdevicediscovery_static.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp index 83a9343a6a..5c72dbe7e2 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp +++ b/src/platformsupport/devicediscovery/qdevicediscovery_static.cpp @@ -135,7 +135,7 @@ bool QDeviceDiscoveryStatic::checkDeviceType(const QString &device) qCDebug(lcDD) << "doing static device discovery for " << device; - if ((m_types & Device_DRM) && device.contains(QString::fromLatin1(QT_DRM_DEVICE_PREFIX))) { + if ((m_types & Device_DRM) && device.contains(QLatin1String(QT_DRM_DEVICE_PREFIX))) { QT_CLOSE(fd); return true; } |