diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-13 14:05:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-11 17:25:28 +0000 |
| commit | 82499104972d24027044acaff1136ea7d758efe2 (patch) | |
| tree | 8a5fa1819c844b638edf5830fe5531ca707a2e14 /src/core/web_engine_settings.cpp | |
| parent | 73286f99b4ecc3f11485e36b1a090849e5efd4ef (diff) | |
Adaptations for Chromium 59
Change-Id: I472053e316bfa782d0a6fb8903f4901be12247ae
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
| -rw-r--r-- | src/core/web_engine_settings.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index da0de1de3..63c2aa519 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -83,21 +83,6 @@ private: WebEngineSettings *m_settings; }; -static inline bool isTouchScreenAvailable() { - static bool initialized = false; - static bool touchScreenAvailable = false; - if (!initialized) { - Q_FOREACH (const QTouchDevice *d, QTouchDevice::devices()) { - if (d->type() == QTouchDevice::TouchScreen) { - touchScreenAvailable = true; - break; - } - } - initialized = true; - } - return touchScreenAvailable; -} - static inline bool isTouchEventsAPIEnabled() { static bool initialized = false; static bool touchEventsAPIEnabled = false; @@ -114,7 +99,7 @@ static inline bool isTouchEventsAPIEnabled() { if (touchEventsSwitchValue == switches::kTouchEventFeatureDetectionEnabled) touchEventsAPIEnabled = true; else if (touchEventsSwitchValue == switches::kTouchEventFeatureDetectionAuto) - touchEventsAPIEnabled = isTouchScreenAvailable(); + touchEventsAPIEnabled = (ui::GetTouchScreensAvailability() == ui::TouchScreensAvailability::ENABLED); initialized = true; } @@ -323,7 +308,6 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p { // Override for now prefs->touch_event_feature_detection_enabled = isTouchEventsAPIEnabled(); - prefs->device_supports_touch = isTouchScreenAvailable(); if (prefs->viewport_enabled) { // We should enable viewport and viewport-meta together, but since 5.7 we // no longer have a command-line flag for viewport-meta. |