summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-05-11 13:43:45 +0200
committerMichal Klocek <michal.klocek@theqtcompany.com>2016-07-02 04:33:41 +0000
commit42504596248a10eb31a5b719e0676b71f55871e4 (patch)
treee7f1008595bb417e2b92bcfbb5bf4c0eb71196bf /tools
parent1e204d3b74fbe275fb4d9fe45bbb011742f828f9 (diff)
Add back spellchecking support
This reverts commit: * d364c05de52f9ab39034e56cac4e0a7981dc541d * e507f140b70f464fb970d2f94357ac588dcc4f03 Moreover it fixes shut down of keyed services, updates versioning of and fixes spellcheck unit test context menu request, which otherwise fails on windows. Change-Id: I9bfc589544cb969abd6d2d7af69531b4c5c907b7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 7ef4b8545..5b2a85330 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -64,9 +64,6 @@ defineTest(runConfigure) {
}
}
- # Spellcheck support is moved to dev
- WEBENGINE_CONFIG += no_spellcheck
-
isEmpty(skipBuildReason): {
cache(CONFIG, add, $$list(webengine_successfully_configured))
!isEmpty(WEBENGINE_CONFIG) {
@@ -74,7 +71,6 @@ defineTest(runConfigure) {
export(WEBENGINE_CONFIG)
}
}
-
}
# This is called from default_post, at which point we've also parsed