summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_settings.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-28 13:06:42 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-02 22:58:58 +0000
commitc5a6521075a6430b6ec478e55ea6caf7936119a7 (patch)
tree6457ffd6dd2a118c762222be333a343b4a1d0be8 /src/core/web_engine_settings.cpp
parent5bd5dff7b4267d26476043d7f89fe336dc9be5a6 (diff)
Fix viewport support
Set the viewport related preferences together. Task-number: QTWB-2 Task-number: QTBUG-57206 Change-Id: Ib06bf0159d0e0d77d963f8fa3752b668e4795f8b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
-rw-r--r--src/core/web_engine_settings.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index 0079e02ba..39af811e9 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -325,9 +325,10 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
prefs->touch_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.
+ // 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.