diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-03-16 08:02:06 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2023-03-22 14:02:58 +0000 |
| commit | a55215df483c8894e25418f2892d2f16f417f13f (patch) | |
| tree | 71da9be9c1acfc7adcabddb39957677e7f92b5a0 | |
| parent | 2ce741554402b95b399773fe18a8e5c06258afbe (diff) | |
coin: be explicit about accepted commercial licenses
Dunfell is only branch that still uses the old whitelist variable.
Rename the include file and be specific what commercial recipes the
build needs. Remove the separate post-inclusive include file and move
the accepted commercial license variable to common include file.
Pick-to: 6.5
Change-Id: Ic80b42d71037637298c805a60f20c8737f00b026
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 10 | ||||
| -rw-r--r-- | coin/test-configs.inc | 2 | ||||
| -rw-r--r-- | coin/test-dunfell.inc | 1 | ||||
| -rw-r--r-- | coin/test-post-inclusive.inc | 1 | ||||
| -rw-r--r-- | coin/test-pre-inclusive.inc | 1 |
5 files changed, 8 insertions, 7 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index b767e37..efcee88 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -34,7 +34,7 @@ target1: &target1 variableValue: kirkstone.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs post-inclusive wayland + variableValue: ci configs wayland enable_if: condition: property property: target.arch @@ -50,7 +50,7 @@ target2: &target2 variableValue: langdale.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs post-inclusive wayland mingw no-webengine + variableValue: ci configs wayland mingw no-webengine enable_if: condition: property property: target.arch @@ -66,7 +66,7 @@ target3: &target3 variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs post-inclusive + variableValue: ci configs enable_if: condition: property property: target.arch @@ -82,7 +82,7 @@ target4: &target4 variableValue: dunfell.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs pre-inclusive no-webengine + variableValue: ci configs dunfell no-webengine enable_if: condition: property property: target.arch @@ -98,7 +98,7 @@ target5: &target5 variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs post-inclusive wayland static no-webengine + variableValue: ci configs wayland static no-webengine enable_if: condition: property property: target.arch diff --git a/coin/test-configs.inc b/coin/test-configs.inc index ff038e9..f4f9629 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -13,6 +13,8 @@ INHERIT += "rm_work" # default to commercial Qt QT_EDITION = "commercial" +LICENSE_FLAGS_ACCEPTED = "commercial_ffmpeg" + # include commercial addons and enable Qt QML Compiler QT_COMMERCIAL_MODULES = "1" diff --git a/coin/test-dunfell.inc b/coin/test-dunfell.inc new file mode 100644 index 0000000..efc9238 --- /dev/null +++ b/coin/test-dunfell.inc @@ -0,0 +1 @@ +LICENSE_FLAGS_WHITELIST = "commercial_ffmpeg commercial_x264" diff --git a/coin/test-post-inclusive.inc b/coin/test-post-inclusive.inc deleted file mode 100644 index bc279fa..0000000 --- a/coin/test-post-inclusive.inc +++ /dev/null @@ -1 +0,0 @@ -LICENSE_FLAGS_ACCEPTED = "commercial" diff --git a/coin/test-pre-inclusive.inc b/coin/test-pre-inclusive.inc deleted file mode 100644 index 8a371b1..0000000 --- a/coin/test-pre-inclusive.inc +++ /dev/null @@ -1 +0,0 @@ -LICENSE_FLAGS_WHITELIST = "commercial" |