diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:34:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:44:57 +0200 |
| commit | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch) | |
| tree | af152f5ace10bdc5996ac0fb7cc7fd897928d60a /examples | |
| parent | 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff) | |
| parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/webengine/api/qquickwebenginesettings_p.h
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
Change-Id: I9cac7059557084a575af02782af886f55a8d404f
Diffstat (limited to 'examples')
| -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.") } + |