Add a setting to control if the PDF viewer is enabled

[ChangeLog] Introduces a setting to control if the internal PDF viewer
is enabled. By default, PDF documents will now be opened in the viewer
instead of being downloaded.

Change-Id: I78b3b3702ae3be3da58c9635720ba861db3de661
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

2 files changed, 26 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 6e96e76cf..4f6a8c148 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -457,6 +457,20 @@ bool QQuickWebEngineSettings::dnsPrefetchEnabled() const
 }
 
 /*!
+    \qmlproperty bool WebEngineSettings::pdfViewerEnabled
+    \since QtWebEngine 1.9
+
+    Specifies that PDF documents will be opened in the internal PDF viewer
+    instead of being downloaded.
+
+    Enabled by default.
+*/
+bool QQuickWebEngineSettings::pdfViewerEnabled() const
+{
+    return d_ptr->testAttribute(WebEngineSettings::PDFViewerEnabled);
+}
+
+/*!
     \qmlproperty string WebEngineSettings::defaultTextEncoding
     \since QtWebEngine 1.2
 
@@ -714,6 +728,14 @@ void QQuickWebEngineSettings::setDnsPrefetchEnabled(bool on)
         Q_EMIT dnsPrefetchEnabledChanged();
 }
 
+void QQuickWebEngineSettings::setPDFViewerEnabled(bool on)
+{
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::PDFViewerEnabled);
+    d_ptr->setAttribute(WebEngineSettings::PDFViewerEnabled, on);
+    if (wasOn != on)
+        Q_EMIT pdfViewerEnabledChanged();
+}
+
 void QQuickWebEngineSettings::setUnknownUrlSchemePolicy(QQuickWebEngineSettings::UnknownUrlSchemePolicy policy)
 {
     WebEngineSettings::UnknownUrlSchemePolicy oldPolicy = d_ptr->unknownUrlSchemePolicy();
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index 6e1aaca39..ae6703bd2 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -93,6 +93,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
     Q_PROPERTY(bool webRTCPublicInterfacesOnly READ webRTCPublicInterfacesOnly WRITE setWebRTCPublicInterfacesOnly NOTIFY webRTCPublicInterfacesOnlyChanged REVISION 6 FINAL)
     Q_PROPERTY(bool javascriptCanPaste READ javascriptCanPaste WRITE setJavascriptCanPaste NOTIFY javascriptCanPasteChanged REVISION 6 FINAL)
     Q_PROPERTY(bool dnsPrefetchEnabled READ dnsPrefetchEnabled WRITE setDnsPrefetchEnabled NOTIFY dnsPrefetchEnabledChanged REVISION 7 FINAL)
+    Q_PROPERTY(bool pdfViewerEnabled READ pdfViewerEnabled WRITE setPDFViewerEnabled NOTIFY pdfViewerEnabledChanged REVISION 8 FINAL)
 
 public:
     enum UnknownUrlSchemePolicy {
@@ -135,6 +136,7 @@ public:
     bool webRTCPublicInterfacesOnly() const;
     bool javascriptCanPaste() const;
     bool dnsPrefetchEnabled() const;
+    bool pdfViewerEnabled() const;
 
     void setAutoLoadImages(bool on);
     void setJavascriptEnabled(bool on);
@@ -166,6 +168,7 @@ public:
     void setWebRTCPublicInterfacesOnly(bool on);
     void setJavascriptCanPaste(bool on);
     void setDnsPrefetchEnabled(bool on);
+    void setPDFViewerEnabled(bool on);
 
 signals:
     void autoLoadImagesChanged();
@@ -198,6 +201,7 @@ signals:
     Q_REVISION(6) void webRTCPublicInterfacesOnlyChanged();
     Q_REVISION(6) void javascriptCanPasteChanged();
     Q_REVISION(7) void dnsPrefetchEnabledChanged();
+    Q_REVISION(8) void pdfViewerEnabledChanged();
 
 private:
     explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);