diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 12:50:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 12:50:46 +0100 |
| commit | 6921ebd6d8bc8bb62d9118c7a1a750f2fd787897 (patch) | |
| tree | d465cc6e4984808c6146d6f4ff8b21cb9aef406d /src/core/web_engine_settings.cpp | |
| parent | 716d179927c001934b177a36fab5dc209ac6d5c9 (diff) | |
| parent | f979b271e158bc93b7361d4b891ed49ee58ab865 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ia24d831c2d2b04d13cf6eef2883d2ab2e4cad642
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 498c4e799..19af6b8d5 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -308,9 +308,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. |