diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-18 10:25:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-18 10:46:46 +0100 |
| commit | 90178924ee7dda26e5f9b07c21eb6b3c7b802c98 (patch) | |
| tree | 47a4e72b173e5e2ad10aacbb726931f03e358e27 /src/core/web_engine_settings.cpp | |
| parent | 168867aac8789f00adad08e574b16569084cb9cd (diff) | |
| parent | 6f9ecd0a4675b0e1a7ef6851cbda7e43c05e9536 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I9ddd2bdd830a862cd81dc1af5616d43e652a1c0e
Diffstat (limited to 'src/core/web_engine_settings.cpp')
| -rw-r--r-- | src/core/web_engine_settings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 58245d760..f438091c6 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -355,9 +355,10 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p // Override for now prefs->touch_event_feature_detection_enabled = isTouchEventsAPIEnabled(); 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. + // We need to enable the viewport options together as it doesn't really work + // to enable them separately. With viewport-enabled we match Android defaults. prefs->viewport_meta_enabled = true; + prefs->shrinks_viewport_contents_to_fit = true; } // Attributes mapping. |