From f1a7977f92df4578891ea54b12a62d6054b16b55 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 22 Oct 2018 17:24:13 +0200 Subject: Allow client certificates without openssl We don't use OpenSSL, but only depended on it because QtNetwork didn't define QSslCertificate without an SSL backend. I changed that in QtNetwork 5.12, so we only rely on a QtNetwork SSL backend with older Qt versions. Task-number: QTBUG-54877 Change-Id: I16f3077235f5c48610597868608ef2e5ca2efa99 Reviewed-by: Alexandru Croitor --- examples/webenginewidgets/simplebrowser/webpage.cpp | 4 ++-- examples/webenginewidgets/simplebrowser/webpage.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp index ab9dce4b8..e44410284 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.cpp +++ b/examples/webenginewidgets/simplebrowser/webpage.cpp @@ -66,7 +66,7 @@ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) connect(this, &QWebEnginePage::featurePermissionRequested, this, &WebPage::handleFeaturePermissionRequested); connect(this, &QWebEnginePage::proxyAuthenticationRequired, this, &WebPage::handleProxyAuthenticationRequired); connect(this, &QWebEnginePage::registerProtocolHandlerRequested, this, &WebPage::handleRegisterProtocolHandlerRequested); -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) connect(this, &QWebEnginePage::selectClientCertificate, this, &WebPage::handleSelectClientCertificate); #endif } @@ -197,7 +197,7 @@ void WebPage::handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolH } //! [registerProtocolHandlerRequested] -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) void WebPage::handleSelectClientCertificate(QWebEngineClientCertificateSelection selection) { // Just select one. diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h index 0b351ab31..908295894 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.h +++ b/examples/webenginewidgets/simplebrowser/webpage.h @@ -69,7 +69,7 @@ private slots: void handleFeaturePermissionRequested(const QUrl &securityOrigin, Feature feature); void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost); void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request); -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) void handleSelectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection); #endif }; -- cgit v1.2.3 From 61873d85afdebcd2921ebb0564c4ca3a53a992a8 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 23 Oct 2018 17:50:27 +0200 Subject: Fix size of tab view when devtools are open MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tabs view still trying to fill the entire view even when the bottom was taken by the devtools view. Change-Id: Ia1c4fc7aa9648bf19d5f79dd7ac95ec611318105 Reviewed-by: Jüri Valdmann --- examples/webengine/quicknanobrowser/BrowserWindow.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml index 7b8767b8d..8d62482da 100644 --- a/examples/webengine/quicknanobrowser/BrowserWindow.qml +++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml @@ -367,7 +367,10 @@ ApplicationWindow { return tab; } - anchors.fill: parent + anchors.top: parent.top + anchors.bottom: devToolsView.top + anchors.left: parent.left + anchors.right: parent.right Component.onCompleted: createEmptyTab(defaultProfile) Component { @@ -500,7 +503,7 @@ ApplicationWindow { WebEngineView { id: devToolsView visible: devToolsEnabled.checked - height: 400 + height: visible ? 400 : 0 inspectedView: visible && tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item : null anchors.left: parent.left anchors.right: parent.right -- cgit v1.2.3 From b8f74f94c8310af4141aa09e6943182cad811515 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Wed, 31 Oct 2018 09:02:55 +0100 Subject: Fix typo in error message of maps example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icd89aea969921ee2a5e6949a4f045ae7439dd618 Reviewed-by: Jüri Valdmann --- examples/webenginewidgets/maps/maps.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/webenginewidgets/maps/maps.pro b/examples/webenginewidgets/maps/maps.pro index b1cb3b28b..fead8fe0b 100644 --- a/examples/webenginewidgets/maps/maps.pro +++ b/examples/webenginewidgets/maps/maps.pro @@ -12,6 +12,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/maps INSTALLS += target !qtConfig(webengine-geolocation) { - error('Qt WebEngine compiled without geolocaton support, this example will not work.') + error('Qt WebEngine compiled without geolocation support, this example will not work.') } -- cgit v1.2.3