diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
| commit | 8a164aa2cd83d728ce620c2b7199ebc6222b55cb (patch) | |
| tree | e63e01795baafd41e2a65641d21eb00469bed0c5 /tests/auto/widgets/widgets.pro | |
| parent | 5480a26d2f16dacfbce47da337559b5bcfb3d45e (diff) | |
| parent | f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/core/web_event_factory.cpp
src/core/web_event_factory.h
src/webengine/render_widget_host_view_qt_delegate_quick.h
Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b
Diffstat (limited to 'tests/auto/widgets/widgets.pro')
| -rw-r--r-- | tests/auto/widgets/widgets.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index fbabdeaad..28f8f56c1 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -20,8 +20,8 @@ qtConfig(accessibility) { SUBDIRS += qwebengineaccessibility } -qtConfig(spellchecker):!cross_compile { - !qtConfig(native-spellchecker) { +qtConfig(webengine-spellchecker):!cross_compile { + !qtConfig(webengine-native-spellchecker) { SUBDIRS += qwebenginespellcheck } else { message("Spellcheck test will not be built because it depends on usage of Hunspell dictionaries.") |