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>

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

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"
 

coin/test-dunfell.inc

@@ -0,0 +1 @@
+LICENSE_FLAGS_WHITELIST = "commercial_ffmpeg commercial_x264"

coin/test-post-inclusive.inc

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

coin/test-pre-inclusive.inc

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