From 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
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 <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/webenginewidgets/webenginewidgets.pro | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/webenginewidgets/webenginewidgets.pro')

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