summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_settings.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2016-11-21 13:49:32 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-12-29 09:22:00 +0000
commitd35dc57354a3b982e98f76816d2a2ede9981d699 (patch)
tree3c6ded85953099a85aa5d329a8f8536015b7b6dd /src/core/web_engine_settings.cpp
parente2609bcba621110920d847fcfbaf7edec4ae3827 (diff)
Enable viewport-meta setting again
We enabled this using a command-line argument in 5.6, but that argument is no longer available in 5.7, so instead set it to match viewport enabled. Task-number: QTBUG-57206 Change-Id: Ibef9e93bc96f74429870fdb340d6ea0c0030159c Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
-rw-r--r--src/core/web_engine_settings.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index c17177745..2e0669d4e 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -298,6 +298,11 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
{
// Override for now
prefs->touch_enabled = 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.
+ prefs->viewport_meta_enabled = true;
+ }
// Attributes mapping.
prefs->loads_images_automatically = testAttribute(AutoLoadImages);