summaryrefslogtreecommitdiff
path: root/coin
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-04-13 18:55:01 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2021-04-27 15:53:33 +0200
commitc4623d4296f0a5502cba5f2395b97bd28a83dd6f (patch)
tree0e5321aab1fe8c45110c8046e3b15db7792e134a /coin
parentbc04ce3195048a8e236aa510a7a1e6ffa4b742c5 (diff)
downloadqtactiveqt-c4623d4296f0a5502cba5f2395b97bd28a83dd6f.tar.gz
Update tests and examples to use the new '_axserver_' functions
Use the new '_axserver_' function in tests and examples associated to creating of the ActiveX sever. Squash find_package calls. Change-Id: Iacdba7b673ae9cfcc7d9e1ff82d0884e330166ab Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/module_config.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 9a3138d..a9d5011 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -16,6 +16,12 @@ instructions:
condition: property
property: features
contains_value: Documentation
+ - type: AppendToEnvironmentVariable
+ variableName: NON_QTBASE_CONFIGURE_ARGS
+ variableValue: " -DQT_SKIP_AX_SERVER_REGISTRATION=ON"
+ - type: AppendToEnvironmentVariable
+ variableName: NON_QTBASE_TARGET_CONFIGURE_ARGS
+ variableValue: " -DQT_SKIP_AX_SERVER_REGISTRATION=ON"
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test: