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 /examples/webenginewidgets | |
| 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 'examples/webenginewidgets')
| -rw-r--r-- | examples/webenginewidgets/spellchecker/spellchecker.pro | 5 | ||||
| -rw-r--r-- | examples/webenginewidgets/webenginewidgets.pro | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/examples/webenginewidgets/spellchecker/spellchecker.pro b/examples/webenginewidgets/spellchecker/spellchecker.pro index c6031a36d..4c7ad2c36 100644 --- a/examples/webenginewidgets/spellchecker/spellchecker.pro +++ b/examples/webenginewidgets/spellchecker/spellchecker.pro @@ -1,9 +1,12 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + TEMPLATE = app TARGET = spellchecker QT += webenginewidgets CONFIG += c++11 -contains(WEBENGINE_CONFIG, use_native_spellchecker) { +qtConfig(native-spellchecker) { error("Spellcheck example can not be built when using native OS dictionaries.") } diff --git a/examples/webenginewidgets/webenginewidgets.pro b/examples/webenginewidgets/webenginewidgets.pro index cb7c8aa22..63deb5854 100644 --- a/examples/webenginewidgets/webenginewidgets.pro +++ b/examples/webenginewidgets/webenginewidgets.pro @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + TEMPLATE=subdirs SUBDIRS += \ @@ -12,10 +15,9 @@ SUBDIRS += \ qtHaveModule(positioning): SUBDIRS += maps -contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile { - !contains(WEBENGINE_CONFIG, use_native_spellchecker) { - SUBDIRS += spellchecker - } else { - message("Spellcheck example will not be built because it depends on usage of Hunspell dictionaries.") - } +qtConfig(spellchecker):!qtConfig(native-spellchecker):!cross_compile { + SUBDIRS += spellchecker +} else { + message("Spellcheck example will not be built because it depends on usage of Hunspell dictionaries.") } + |