diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-04-29 17:12:26 +0300 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2016-05-03 06:25:29 +0000 |
| commit | aeecd7445639c118a57bab4e74f7c5d91490d11e (patch) | |
| tree | 238e80f2e0c32ad1eb2711c588af503e5acae912 | |
| parent | a7b6960cf8fbfd2abb4d719efb09a4d7d24cc10a (diff) | |
| download | qtquickcontrols-aeecd7445639c118a57bab4e74f7c5d91490d11e.tar.gz | |
QQuickControlSettings (Android): check touch devices
It's needed for Android devices that have not touch screen,
e.g STB.
QTBUG-36007 is already resolved and we can use QTouchDevice::devices()
Task-number: QTBUG-36007
Task-number: QTBUG-53095
Change-Id: Iaab89cc75238d1aba83ce3d79f3c29fb5cab172f
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 6f7dc729..a15c6889 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -82,15 +82,10 @@ static bool fromResource(const QString &path) bool QQuickControlSettings::hasTouchScreen() const { -// QTBUG-36007 -#if defined(Q_OS_ANDROID) - return true; -#else foreach (const QTouchDevice *dev, QTouchDevice::devices()) if (dev->type() == QTouchDevice::TouchScreen) return true; return false; -#endif } bool QQuickControlSettings::isMobile() const |