diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-04-26 21:18:44 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-05-05 10:03:34 +0200 |
| commit | 06fc47309609b9be735817da4f3bdf2e30e0b99c (patch) | |
| tree | c5b798ff3bc07a3c631b7aa66bea9d088cb73c5b /tests | |
| parent | 8a52dee5ab480eef88b95361cf4db2ce36374c69 (diff) | |
Add support for universal builds for qtwebengine and qtpdf
As 5.15 is in maintenance mode add basic support for
universal build without doing major refactors.
The popper implementation should unify build layout instead
of adding "isUniversal()" hacks.
Add intermediate build files per architecture for Chromium build part
and lipo them before final module linking.
Task-number: QTBUG-85279
Change-Id: Iebfd7a277b23c1b10c8719041c5959fd9d5e2f06
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index 2dc1eefcd..d35f875c1 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -1,3 +1,5 @@ +load(functions) + include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) # workaround for QTBUG-68093 QT_FOR_CONFIG += webenginecore webenginecore-private @@ -37,7 +39,7 @@ qtConfig(ssl) { SUBDIRS += certificateerror } -qtConfig(webengine-spellchecker):!cross_compile { +qtConfig(webengine-spellchecker):!cross_compile:!isUniversal() { !qtConfig(webengine-native-spellchecker) { SUBDIRS += spellchecking } else { |