diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-10-25 14:21:50 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-11-02 21:25:54 +0000 |
| commit | 31e1c595de0bf38453905403fd8d42f4407df639 (patch) | |
| tree | 7ed879cdb01f29964cdda7cbe4a7cf25f0238f43 | |
| parent | be213cd4a9ef753c15ed5b1daf1aa10f7ccbe174 (diff) | |
Change spellchecker-related private features into public ones
This is done because qtConfig(spellchecker) is present
in an example .pro file, and thus "spellchecker" should be
a public feature.
Change-Id: Idff977b8d0835b049c4c19dc42c1475d2c55c323
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | configure.json | 4 | ||||
| -rw-r--r-- | examples/webenginewidgets/spellchecker/spellchecker.pro | 2 | ||||
| -rw-r--r-- | examples/webenginewidgets/webenginewidgets.pro | 2 | ||||
| -rw-r--r-- | src/buildtools/gn.pro | 2 | ||||
| -rw-r--r-- | src/core/gn_run.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/webengine/webengine.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets.pro | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/configure.json b/configure.json index ba7a84273..31b35d0f8 100644 --- a/configure.json +++ b/configure.json @@ -433,7 +433,7 @@ "label": "Spellchecker", "purpose": "Provides a spellchecker.", "section": "WebEngine", - "output": [ "privateFeature" ] + "output": [ "publicFeature" ] }, "native-spellchecker": { "label": "Native Spellchecker", @@ -441,7 +441,7 @@ "section": "WebEngine", "autoDetect": false, "condition": "config.macos && features.spellchecker", - "output": [ "privateFeature" ] + "output": [ "publicFeature" ] }, "ui-delegates": { "label": "UI Delegates", diff --git a/examples/webenginewidgets/spellchecker/spellchecker.pro b/examples/webenginewidgets/spellchecker/spellchecker.pro index 551baf3d3..a5f59974a 100644 --- a/examples/webenginewidgets/spellchecker/spellchecker.pro +++ b/examples/webenginewidgets/spellchecker/spellchecker.pro @@ -1,4 +1,4 @@ -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine TEMPLATE = app TARGET = spellchecker diff --git a/examples/webenginewidgets/webenginewidgets.pro b/examples/webenginewidgets/webenginewidgets.pro index af6e54d03..8e91c530b 100644 --- a/examples/webenginewidgets/webenginewidgets.pro +++ b/examples/webenginewidgets/webenginewidgets.pro @@ -1,4 +1,4 @@ -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine TEMPLATE=subdirs diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 02d3df652..9d9af9eb8 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -4,7 +4,7 @@ option(host_build) !debug_and_release: CONFIG += release include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine webengine-private build_pass|!debug_and_release { !qtConfig(system-gn): CONFIG(release, debug|release) { diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index c565b99a4..a9089c569 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -1,5 +1,5 @@ include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine webengine-private TEMPLATE = aux diff --git a/src/src.pro b/src/src.pro index 1cd23f9fa..76d342c8d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,5 +1,5 @@ include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine webengine-private TEMPLATE = subdirs diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 4b2170cbc..24fa2d9d8 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,5 +1,5 @@ include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine webengine-private TARGET = QtWebEngine diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index 0ee0a84f7..027eeb235 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -1,4 +1,4 @@ -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine TEMPLATE = subdirs |