Add support for Shockwave Flash plugin.

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 <michael.bruning@theqtcompany.com>

2 files changed, 24 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 8a88bac68..26ea094a5 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -209,6 +209,18 @@ bool QQuickWebEngineSettings::errorPageEnabled() const
 }
 
 /*!
+    \qmlproperty bool WebEngineSettings::pluginsEnabled
+
+    This setting enables general support for plugins.
+
+    It is disabled by default.
+*/
+bool QQuickWebEngineSettings::pluginsEnabled() const
+{
+    return d_ptr->testAttribute(WebEngineSettings::PluginsEnabled);
+}
+
+/*!
     \qmlproperty QString WebEngineSettings::defaultTextEncoding
 
     The \a encoding, must be a string describing an encoding such as "utf-8",
@@ -312,6 +324,14 @@ void QQuickWebEngineSettings::setErrorPageEnabled(bool on)
         Q_EMIT errorPageEnabledChanged();
 }
 
+void QQuickWebEngineSettings::setPluginsEnabled(bool on)
+{
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::PluginsEnabled);
+    d_ptr->setAttribute(WebEngineSettings::PluginsEnabled, on);
+    if (wasOn != on)
+        Q_EMIT pluginsEnabledChanged();
+}
+
 void QQuickWebEngineSettings::setDefaultTextEncoding(QString encoding)
 {
     const QString oldDefaultTextEncoding = d_ptr->defaultTextEncoding();
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: