diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 19:12:38 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-20 10:43:09 +0000 |
commit | 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 (patch) | |
tree | daf2617622536fc9c96ed9818ecba3d892f999b7 /src/webenginewidgets/webenginewidgets.pro | |
parent | c9b3baa2e2825df6b06e7366d154341f73d4e326 (diff) |
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>
Diffstat (limited to 'src/webenginewidgets/webenginewidgets.pro')
-rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 9 |
1 files changed, 3 insertions, 6 deletions
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) |