diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-23 10:16:33 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-10-11 09:21:27 +0000 |
| commit | 31610bf8c08f1fe26d7af391b9eae972c1f21e6e (patch) | |
| tree | c34b06a727c6660a737689471f266ec31b461eba | |
| parent | ae8b953343ac89134865e969f45cd2a6e029016c (diff) | |
CI: Turn dbus support off for QNX_710
QtDBus is built even if system dbus is not found, and QtGui depends
on QtDBus. To link a consumer of QtGui, the -rpath-link option must
be passed to the linker. That is not done at the moment, due to
QTBUG-86533.
Fixes: QTBUG-96791
Task-number: QTBUG-86533
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 420adf322a71aee5035cb6ae075e11afcee1fe3c)
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 141a087b..dca1a20b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -151,7 +151,7 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', + 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' @@ -162,7 +162,7 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake', + 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' @@ -173,5 +173,5 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake', + 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] |