diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-10-21 14:02:25 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-11-14 14:25:35 +0000 |
| commit | 33e20b479f112979ddb29ccc164af530e3be4f3c (patch) | |
| tree | f035b54da8344b66fbe27f22d3f0b5860fa3c7b6 /src | |
| parent | a888346c3d999f81f15444343bf0018470d9a65d (diff) | |
Add spellchecker feature to new config system
Change-Id: I35a5c815c9f2b3ebacb5991ba6645641b17db2db
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/gyp_run.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/webengine/webengine.pro | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 233737751..1850447e7 100644 --- a/src/core/gyp_run.pro +++ b/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 { diff --git a/src/src.pro b/src/src.pro index 495263846..9b5373181 100644 --- a/src/src.pro +++ b/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 diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 6b2285c85..99b9c4e6f 100644 --- a/src/webengine/webengine.pro +++ b/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 } diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index abd487e5f..64e475422 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/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 } |