From 3ed2314133cca326363b8bef1a5927dfb685e2a0 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Wed, 21 Jan 2015 10:42:47 +0200 Subject: Add support for Shockwave Flash plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We will try to load the pepper flash plugin from the places where it is most commonly located. Alternatively the location and flash version can be passed on the command line. Change-Id: I41367586462157e722661aab3630357d6caf6a81 Reviewed-by: Michael Brüning --- src/webengine/api/qquickwebenginesettings_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/webengine/api/qquickwebenginesettings_p.h') diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index 68c85ea7f..f077c0ee2 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -60,6 +60,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject { Q_PROPERTY(bool localContentCanAccessFileUrls READ localContentCanAccessFileUrls WRITE setLocalContentCanAccessFileUrls NOTIFY localContentCanAccessFileUrlsChanged) Q_PROPERTY(bool hyperlinkAuditingEnabled READ hyperlinkAuditingEnabled WRITE setHyperlinkAuditingEnabled NOTIFY hyperlinkAuditingEnabledChanged) Q_PROPERTY(bool errorPageEnabled READ errorPageEnabled WRITE setErrorPageEnabled NOTIFY errorPageEnabledChanged) + Q_PROPERTY(bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled NOTIFY pluginsEnabledChanged) Q_PROPERTY(QString defaultTextEncoding READ defaultTextEncoding WRITE setDefaultTextEncoding NOTIFY defaultTextEncodingChanged) public: @@ -76,6 +77,7 @@ public: bool localContentCanAccessFileUrls() const; bool hyperlinkAuditingEnabled() const; bool errorPageEnabled() const; + bool pluginsEnabled() const; QString defaultTextEncoding() const; void setAutoLoadImages(bool on); @@ -89,6 +91,7 @@ public: void setLocalContentCanAccessFileUrls(bool on); void setHyperlinkAuditingEnabled(bool on); void setErrorPageEnabled(bool on); + void setPluginsEnabled(bool on); void setDefaultTextEncoding(QString encoding); signals: @@ -103,6 +106,7 @@ signals: void localContentCanAccessFileUrlsChanged(); void hyperlinkAuditingEnabledChanged(); void errorPageEnabledChanged(); + void pluginsEnabledChanged(); void defaultTextEncodingChanged(); private: -- cgit v1.2.3