diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-13 11:57:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-22 15:29:27 +0000 |
| commit | a7a7eb4c525a4fb78a3f0f1205262b147304261d (patch) | |
| tree | f1e89a5ab3574777766c6151e3a28680aa57b202 /src/webengine/api/qquickwebenginesettings_p.h | |
| parent | b04131f375a64204be962e7b92c88a3ecaf892c5 (diff) | |
Expose allow-running-insecure-contents as a setting
AllowRunningInsecureContent was added as a setting in core to enable
parsing a chromium command-line argument. This patch forwards the
setting to our API layers.
[ChangeLog][Settings] Added setting to allow secure content to run
insecure content.
Task-number: QTBUG-54902
Change-Id: I4e005be1a29905ccf931fabe9ccb308b7d947c62
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/webengine/api/qquickwebenginesettings_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index 917b9e443..a53c7cdb3 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -84,6 +84,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject { Q_PROPERTY(bool touchIconsEnabled READ touchIconsEnabled WRITE setTouchIconsEnabled NOTIFY touchIconsEnabledChanged REVISION 2) Q_PROPERTY(bool focusOnNavigationEnabled READ focusOnNavigationEnabled WRITE setFocusOnNavigationEnabled NOTIFY focusOnNavigationEnabledChanged REVISION 3) Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds NOTIFY printElementBackgroundsChanged REVISION 3) + Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION 3) public: ~QQuickWebEngineSettings(); @@ -109,6 +110,7 @@ public: bool touchIconsEnabled() const; bool focusOnNavigationEnabled() const; bool printElementBackgrounds() const; + bool allowRunningInsecureContent() const; void setAutoLoadImages(bool on); void setJavascriptEnabled(bool on); @@ -131,6 +133,7 @@ public: void setTouchIconsEnabled(bool on); void setFocusOnNavigationEnabled(bool on); void setPrintElementBackgrounds(bool on); + void setAllowRunningInsecureContent(bool on); signals: void autoLoadImagesChanged(); @@ -154,6 +157,7 @@ signals: Q_REVISION(2) void touchIconsEnabledChanged(); Q_REVISION(3) void focusOnNavigationEnabledChanged(); Q_REVISION(3) void printElementBackgroundsChanged(); + Q_REVISION(3) void allowRunningInsecureContentChanged(); private: explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0); |