diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-02-24 07:05:53 +0000 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-02-25 10:51:01 +0200 |
| commit | c949bce36d87452ff7856e50a58e7896f50c58e0 (patch) | |
| tree | 53849c80eb7b5fd5c2cb52d307fd3d8146592981 | |
| parent | 85ce2deaf5d5b867e02449cbf5ac314a839fa5a1 (diff) | |
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 2d4825f3098fb82736b83744b8b2ac212785c894)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 8 | ||||
| -rw-r--r-- | coin/test-configs.inc | 1 | ||||
| -rw-r--r-- | coin/test-post-inclusive.inc | 1 | ||||
| -rw-r--r-- | coin/test-pre-inclusive.inc | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 92104ca..aecf9b0 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -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 diff --git a/coin/test-configs.inc b/coin/test-configs.inc index c4b1905..5823377 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -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 = "\ diff --git a/coin/test-post-inclusive.inc b/coin/test-post-inclusive.inc new file mode 100644 index 0000000..bc279fa --- /dev/null +++ b/coin/test-post-inclusive.inc @@ -0,0 +1 @@ +LICENSE_FLAGS_ACCEPTED = "commercial" diff --git a/coin/test-pre-inclusive.inc b/coin/test-pre-inclusive.inc new file mode 100644 index 0000000..8a371b1 --- /dev/null +++ b/coin/test-pre-inclusive.inc @@ -0,0 +1 @@ +LICENSE_FLAGS_WHITELIST = "commercial" |