diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-03-29 14:02:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-01 09:19:31 +0000 |
| commit | 536fdeee5cb20a4057367c3077276a4ef0ec49ed (patch) | |
| tree | 02879d477b9b0f3bf69887f6d229c4b35b3b3c62 | |
| parent | 76decb7a645b9951845e56b50221940c7a449ea3 (diff) | |
Spellchecker: Fix and clean up qmake build of the example
Change-Id: Ia41c1e385f1bf527cbe636f150d97790adc8f21c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit b7cea1d3c901e08a33fd9a5efb9461dd22091d6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/webenginewidgets/spellchecker/spellchecker.pro | 5 | ||||
| -rw-r--r-- | examples/webenginewidgets/webenginewidgets.pro | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/examples/webenginewidgets/spellchecker/spellchecker.pro b/examples/webenginewidgets/spellchecker/spellchecker.pro index d652e4b1f..a720776ca 100644 --- a/examples/webenginewidgets/spellchecker/spellchecker.pro +++ b/examples/webenginewidgets/spellchecker/spellchecker.pro @@ -1,4 +1,3 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093 QT_FOR_CONFIG += webenginecore TEMPLATE = app @@ -10,7 +9,7 @@ QT += webenginewidgets } qtConfig(webengine-native-spellchecker) { - error("Spellcheck example can not be built when using native OS dictionaries.") + error("Spellchecker example can not be built when using native OS dictionaries.") } HEADERS += \ @@ -34,7 +33,7 @@ DISTFILES += \ target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/spellchecker INSTALLS += target -qtPrepareTool(CONVERT_TOOL, qwebengine_convert_dict) +qtPrepareTool(CONVERT_TOOL, qwebengine_convert_dict, "", "", $$[QT_INSTALL_LIBEXECS]) debug_and_release { CONFIG(debug, debug|release): DICTIONARIES_DIR = debug/qtwebengine_dictionaries diff --git a/examples/webenginewidgets/webenginewidgets.pro b/examples/webenginewidgets/webenginewidgets.pro index f783fc681..c88b7874e 100644 --- a/examples/webenginewidgets/webenginewidgets.pro +++ b/examples/webenginewidgets/webenginewidgets.pro @@ -19,9 +19,9 @@ qtConfig(webengine-printing-and-pdf) { SUBDIRS += printme html2pdf } -#qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile { -# SUBDIRS += spellchecker -#} else { -# message("Spellcheck example will not be built because it depends on usage of Hunspell dictionaries.") -#} +qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile { + SUBDIRS += spellchecker +} else { + message("Spellchecker example will not be built because it depends on usage of Hunspell dictionaries.") +} |