From f4e041643d5f05330e6495d83f2e583da97a69d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Tue, 19 Mar 2019 11:35:44 +0100 Subject: Fix capitalisation of letters for PDF viewer setting PDFViewerEnabled is renamed to PdfViewerEnabled. Task-number: QTBUG-74543 Change-Id: I48a242a52ab0689b06815ac3cbd98c44902cc358 Reviewed-by: Kai Koehne --- src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp | 2 +- src/core/web_engine_settings.cpp | 4 ++-- src/core/web_engine_settings.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core') 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. -- cgit v1.2.3