Add spellchecker feature to new config system

Change-Id: I35a5c815c9f2b3ebacb5991ba6645641b17db2db
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

configure.json

@@ -3,7 +3,8 @@
 
     "commandline": {
         "options": {
-            "proprietary-codecs": "boolean"
+            "proprietary-codecs": "boolean",
+            "spellchecker": "boolean"
         }
     },
 
@@ -13,6 +14,11 @@
             "autoDetect": false,
             "purpose": "Enables the use of proprietary codecs such as h.264/h.265 and MP3",
             "output": [ "privateFeature" ]
+        },
+        "spellchecker": {
+            "label": "Spellchecker",
+            "purpose": "Enables the use of Chromium's spellchecker",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -20,7 +26,8 @@
         {
             "section": "Qt WebEngine",
             "entries": [
-                "proprietary-codecs"
+                "proprietary-codecs",
+                "spellchecker"
             ]
         }
     ]

examples/examples.pro

@@ -16,7 +16,7 @@ qtHaveModule(webenginewidgets) {
         webenginewidgets/markdowneditor \
         webenginewidgets/simplebrowser
 
-    !contains(WEBENGINE_CONFIG, no_spellcheck):!cross_compile {
+    contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
         !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
             SUBDIRS += webenginewidgets/spellchecker
         } else {

src/core/gyp_run.pro

@@ -120,7 +120,7 @@ contains(WEBENGINE_CONFIG, use_appstore_compliant_code): GYP_CONFIG += appstore_
 # but the latter are necessary for useful debug binaries.
 contains(WEBENGINE_CONFIG, reduce_binary_size): GYP_CONFIG += release_optimize=s debug_optimize=s release_unwind_tables=0
 
-contains(WEBENGINE_CONFIG, no_spellcheck): {
+!contains(WEBENGINE_CONFIG, use_spellchecker): {
     GYP_CONFIG += enable_spellcheck=0
     macos: GYP_CONFIG += use_browser_spellchecker=0
 } else {

src/src.pro

@@ -14,7 +14,7 @@ SUBDIRS += core \
            plugins
 
 # allow only desktop builds of qwebengine_convert_dict
-!contains(WEBENGINE_CONFIG, no_spellcheck):!contains(WEBENGINE_CONFIG, use_native_spellchecker):!cross_compile {
+contains(WEBENGINE_CONFIG, use_spellchecker):!contains(WEBENGINE_CONFIG, use_native_spellchecker):!cross_compile {
     SUBDIRS += qwebengine_convert_dict
     qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict
     qwebengine_convert_dict.depends = core

src/webengine/webengine.pro

@@ -61,7 +61,7 @@ isQMLTestSupportApiEnabled() {
     DEFINES += ENABLE_QML_TESTSUPPORT_API
 }
 
-!contains(WEBENGINE_CONFIG, no_spellcheck) {
+contains(WEBENGINE_CONFIG, use_spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 

src/webenginewidgets/webenginewidgets.pro

@@ -48,7 +48,7 @@ HEADERS = \
     DEFINES += QT_UI_DELEGATES
 }
 
-!contains(WEBENGINE_CONFIG, no_spellcheck) {
+contains(WEBENGINE_CONFIG, use_spellchecker) {
     DEFINES += ENABLE_SPELLCHECK
 }
 

tests/auto/widgets/widgets.pro

@@ -13,7 +13,7 @@ SUBDIRS += \
     qwebenginesettings \
     qwebengineview
 
-!contains(WEBENGINE_CONFIG, no_spellcheck):!cross_compile {
+!contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
     !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
         SUBDIRS += qwebenginespellcheck
     } else {

tools/qmake/mkspecs/features/configure.prf

@@ -79,6 +79,7 @@ defineTest(runConfigure) {
         include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
         QT_FOR_CONFIG += webengine-private
         qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs
+        qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker
     }
 
     isEmpty(skipBuildReason): {