From aaac5fe1f9a1be81b919642e6272967f86fef1a5 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 13 Sep 2017 18:40:23 +0200 Subject: Add UI delegates configure option Change-Id: Ib9d6c8842609c4c410ca65a35fefeab481f71cb2 Reviewed-by: Allan Sandfeld Jensen --- src/webenginewidgets/webenginewidgets.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index ad79c1ef9..10791a6ca 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + TARGET = QtWebEngineWidgets # For our export macros @@ -42,7 +45,7 @@ HEADERS = \ api/qwebengineview_p.h \ render_widget_host_view_qt_delegate_widget.h -!contains(WEBENGINE_CONFIG, no_ui_delegates) { +qtConfig(ui-delegates) { SOURCES += ui/messagebubblewidget.cpp HEADERS += ui/messagebubblewidget_p.h DEFINES += QT_UI_DELEGATES -- cgit v1.2.3 From c9b3baa2e2825df6b06e7366d154341f73d4e326 Mon Sep 17 00:00:00 2001 From: Viktor Engelmann Date: Mon, 18 Sep 2017 15:57:24 +0200 Subject: Replace Setting HideScrollbars by ShowScrollBars Positive options are more intuitive and make for a better API. Task-number: QTBUG-63179 Change-Id: I632ee768dba52554e7d37d9da84661a1d01f1f37 Reviewed-by: Joerg Bornemann Reviewed-by: Leena Miettinen --- src/webenginewidgets/api/qwebenginesettings.cpp | 4 ++-- src/webenginewidgets/api/qwebenginesettings.h | 2 +- src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 439e00590..1def61cb6 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -99,8 +99,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::AllowGeolocationOnInsecureOrigins; case QWebEngineSettings::AllowWindowActivationFromJavaScript: return WebEngineSettings::AllowWindowActivationFromJavaScript; - case QWebEngineSettings::HideScrollbars: - return WebEngineSettings::HideScrollbars; + case QWebEngineSettings::ShowScrollBars: + return WebEngineSettings::ShowScrollBars; default: return WebEngineSettings::UnsupportedInCoreSettings; diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index 1857e5228..470609227 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -91,7 +91,7 @@ public: AllowRunningInsecureContent, AllowGeolocationOnInsecureOrigins, AllowWindowActivationFromJavaScript, - HideScrollbars + ShowScrollBars }; enum FontSize { diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index e6a94281e..d3b16a935 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -165,9 +165,9 @@ \value AllowWindowActivationFromJavaScript Allows the window.focus() method in JavaScript. Disallowed by default. (Added in Qt 5.10) - \value HideScrollbars - Hides scrollbars. - Disabled by default. (Added in Qt 5.10) + \value ShowScrollBars + Shows scroll bars. + Enabled by default. (Added in Qt 5.10) */ -- cgit v1.2.3 From 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 13 Sep 2017 19:12:38 +0200 Subject: Remove WEBENGINE_CONFIG from configure Do not store flags in qmake.cache with WEBENGINE_CONFIG. Use directly qtConfig values insted. This makes configuration more consistent, simplifies handling and avoids passing values from qtConfig to WEBENIGNE_CONFIG, which then were passed to gn. [ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Qt CI Bot --- src/webenginewidgets/webenginewidgets.pro | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index 10791a6ca..a5c22e7be 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -51,17 +51,14 @@ qtConfig(ui-delegates) { DEFINES += QT_UI_DELEGATES } -contains(WEBENGINE_CONFIG, use_spellchecker) { +qtConfig(spellchecker) { DEFINES += ENABLE_SPELLCHECK } -use?(printing) { +qtConfig(printing-and-pdf) { DEFINES += ENABLE_PRINTING - QT += printsupport -} - -use?(pdf) { DEFINES += ENABLE_PDF + QT += printsupport } load(qt_module) -- cgit v1.2.3