diff options
author | Michal Klocek <michal.klocek@qt.io> | 2024-02-15 12:31:43 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2024-04-09 20:14:53 +0200 |
commit | 5915af8855d31ec851b7ff4aec01e5d375129059 (patch) | |
tree | f4be717702b3fda00e8b6432c9d5dd8dfbd13827 | |
parent | e227bbddbfc03c45735978f5b83994235225569a (diff) |
Fix enable_plugins gn parameter use
In 106-based adaptations enable_plugins use was
changed and it means enabling support for handing plugins,
but does not include support for loading plugins using specific
technology like Pepper.
Moreover, enable_pdf requires plugin support, but it does not
require Pepper support (enable_ppapi).
Fixes: QTBUG-122137
Change-Id: I75cf611e54d0a47e2b96e7831c1fe1d20b6254b5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit d66a5433e08bce11f905b14c8a03f3a5e1db2b9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9dc04234d372c43300f013444a56fee30999a83b)
(cherry picked from commit 7d6b43b7bc05ec17111836cc890f6692888f0c1c)
-rw-r--r-- | src/core/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 20ef91637..3b2e21d9b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -356,9 +356,14 @@ foreach(arch ${archs}) ) extend_gn_list(gnArgArg ARGS enable_plugins - CONDITION QT_FEATURE_webengine_pepper_plugins + CONDITION QT_FEATURE_webengine_printing_and_pdf OR + QT_FEATURE_webengine_pepper_plugins ) extend_gn_list(gnArgArg + ARGS enable_ppapi + CONDITION QT_FEATURE_webengine_pepper_plugins + ) + extend_gn_list(gnArgArg ARGS enable_spellcheck CONDITION QT_FEATURE_webengine_spellchecker ) |