diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2019-03-19 11:35:44 +0100 |
---|---|---|
committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-19 20:41:10 +0000 |
commit | f4e041643d5f05330e6495d83f2e583da97a69d7 (patch) | |
tree | bbc74479c6415b360c9d12476bf9333f7b3f4eef | |
parent | 0f30fe4b6ae26b4797272926318c31b1f07acc20 (diff) |
Fix capitalisation of letters for PDF viewer setting
PDFViewerEnabled is renamed to PdfViewerEnabled.
Task-number: QTBUG-74543
Change-Id: I48a242a52ab0689b06815ac3cbd98c44902cc358
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r-- | src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/web_engine_settings.cpp | 4 | ||||
-rw-r--r-- | src/core/web_engine_settings.h | 2 | ||||
-rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 8 | ||||
-rw-r--r-- | src/webengine/api/qquickwebenginesettings_p.h | 4 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 4 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.h | 2 | ||||
-rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp index 0a6adf4d6..007aa9b63 100644 --- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp +++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp @@ -92,7 +92,7 @@ void OnPdfStreamIntercepted( return; WebEngineSettings *settings = contentsDelegate->webEngineSettings(); - if (!settings->testAttribute(WebEngineSettings::PDFViewerEnabled) + if (!settings->testAttribute(WebEngineSettings::PdfViewerEnabled) || !settings->testAttribute(WebEngineSettings::PluginsEnabled)) { // If the applications has been set up to always download PDF files to open them in an // external viewer, trigger the download. diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 705c0c106..5a01308a1 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -284,9 +284,9 @@ void WebEngineSettings::initDefaults() s_defaultAttributes.insert(JavascriptCanPaste, false); s_defaultAttributes.insert(DnsPrefetchEnabled, false); #if QT_CONFIG(webengine_extensions) - s_defaultAttributes.insert(PDFViewerEnabled, true); + s_defaultAttributes.insert(PdfViewerEnabled, true); #else - s_defaultAttributes.insert(PDFViewerEnabled, false); + s_defaultAttributes.insert(PdfViewerEnabled, false); #endif } diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index 8e1bb741c..d7eeaa560 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -103,7 +103,7 @@ public: WebRTCPublicInterfacesOnly, JavascriptCanPaste, DnsPrefetchEnabled, - PDFViewerEnabled, + PdfViewerEnabled, }; // Must match the values from the public API in qwebenginesettings.h. diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 4f6a8c148..93a3668ed 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -467,7 +467,7 @@ bool QQuickWebEngineSettings::dnsPrefetchEnabled() const */ bool QQuickWebEngineSettings::pdfViewerEnabled() const { - return d_ptr->testAttribute(WebEngineSettings::PDFViewerEnabled); + return d_ptr->testAttribute(WebEngineSettings::PdfViewerEnabled); } /*! @@ -728,10 +728,10 @@ void QQuickWebEngineSettings::setDnsPrefetchEnabled(bool on) Q_EMIT dnsPrefetchEnabledChanged(); } -void QQuickWebEngineSettings::setPDFViewerEnabled(bool on) +void QQuickWebEngineSettings::setPdfViewerEnabled(bool on) { - bool wasOn = d_ptr->testAttribute(WebEngineSettings::PDFViewerEnabled); - d_ptr->setAttribute(WebEngineSettings::PDFViewerEnabled, on); + bool wasOn = d_ptr->testAttribute(WebEngineSettings::PdfViewerEnabled); + d_ptr->setAttribute(WebEngineSettings::PdfViewerEnabled, on); if (wasOn != on) Q_EMIT pdfViewerEnabledChanged(); } diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index ae6703bd2..ce43e0e9c 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -93,7 +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) + Q_PROPERTY(bool pdfViewerEnabled READ pdfViewerEnabled WRITE setPdfViewerEnabled NOTIFY pdfViewerEnabledChanged REVISION 8 FINAL) public: enum UnknownUrlSchemePolicy { @@ -168,7 +168,7 @@ public: void setWebRTCPublicInterfacesOnly(bool on); void setJavascriptCanPaste(bool on); void setDnsPrefetchEnabled(bool on); - void setPDFViewerEnabled(bool on); + void setPdfViewerEnabled(bool on); signals: void autoLoadImagesChanged(); diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 5c91511b5..d9fb3b000 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -109,8 +109,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::JavascriptCanPaste; case QWebEngineSettings::DnsPrefetchEnabled: return WebEngineSettings::DnsPrefetchEnabled; - case QWebEngineSettings::PDFViewerEnabled: - return WebEngineSettings::PDFViewerEnabled; + case QWebEngineSettings::PdfViewerEnabled: + return WebEngineSettings::PdfViewerEnabled; default: return WebEngineSettings::UnsupportedInCoreSettings; } diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index 3657702d2..d39291fed 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -96,7 +96,7 @@ public: WebRTCPublicInterfacesOnly, JavascriptCanPaste, DnsPrefetchEnabled, - PDFViewerEnabled, + PdfViewerEnabled, }; enum FontSize { diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 34fdcb30f..ce75a4203 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -188,7 +188,7 @@ \value DnsPrefetchEnabled Specifies whether WebEngine will try to pre-fetch DNS entries to speed up browsing. Disabled by default. (Added in Qt 5.12) - \value EnablePDFViewer Specifies that PDF documents will be opened in the internal PDF viewer + \value PdfViewerEnabled Specifies that PDF documents will be opened in the internal PDF viewer instead of being downloaded. Enabled by default. (Added in Qt 5.13) */ |