diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-30 12:46:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-30 12:47:20 +0200 |
| commit | da6f33c8929bf122e7cdec5617d89c59d03e3632 (patch) | |
| tree | 9d90d90a3e7cdd6fbca8d40b54a45e90877677e4 /src/core/web_engine_settings.h | |
| parent | 9cda8d4384825bd93b949f31953548beda165ef8 (diff) | |
| parent | 327c9b9e0c68550e474d9ffdc21ece6324b5e7a1 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I82f7a6a6d1bf27dc8adf7e2a91ea8ab29c54a607
Diffstat (limited to 'src/core/web_engine_settings.h')
| -rw-r--r-- | src/core/web_engine_settings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index 31f2198b8..8459ba75b 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -81,7 +81,8 @@ public: AutoLoadIconsForPage, TouchIconsEnabled, FocusOnNavigationEnabled, - PrintElementBackgrounds + PrintElementBackgrounds, + AllowRunningInsecureContent }; // Must match the values from the public API in qwebenginesettings.h. |