Coin: adapt to variable renaming

In kirkstone, some of the variable have been renamed to
use inclusive language.

Change-Id: Ic03fc3a748ea6a4e3e510040b9cd6b5e038d4662
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2d4825f309)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2022-02-24 07:05:53 +00:00 committed by Qt Cherry-pick Bot
parent fef2b23c08
commit e209f4f496
4 changed files with 6 additions and 5 deletions

View File

@ -33,7 +33,7 @@ target1: &target1
variableValue: master.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs wayland
variableValue: ci configs post-inclusive wayland
enable_if:
condition: property
property: target.arch
@ -49,7 +49,7 @@ target2: &target2
variableValue: honister.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs wayland mingw
variableValue: ci configs pre-inclusive wayland mingw
enable_if:
condition: property
property: target.arch
@ -65,7 +65,7 @@ target3: &target3
variableValue: hardknott.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs
variableValue: ci configs pre-inclusive
enable_if:
condition: property
property: target.arch
@ -81,7 +81,7 @@ target4: &target4
variableValue: dunfell.xml
- type: EnvironmentVariable
variableName: TEST_CONFIGS
variableValue: ci configs no-webengine
variableValue: ci configs pre-inclusive no-webengine
enable_if:
condition: property
property: target.arch

View File

@ -39,7 +39,6 @@ ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
# enable webengine with commercial/proprietary features
DISTRO_FEATURES:append = " webengine"
LICENSE_FLAGS_WHITELIST = "commercial"
PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"
PACKAGECONFIG:append:pn-qtbase = "\

View File

@ -0,0 +1 @@
LICENSE_FLAGS_ACCEPTED = "commercial"

View File

@ -0,0 +1 @@
LICENSE_FLAGS_WHITELIST = "commercial"