diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2021-07-28 10:48:01 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2021-07-29 08:19:41 +0300 |
| commit | 16ab287262e246b27c83f18ccdbd47d68485bbf6 (patch) | |
| tree | c700b85550f0d2a795fd8708293dc02e0a56ec2a | |
| parent | 105cddfef22a52e560e8e4091ae60ba6f171d73f (diff) | |
Add Integrity target for other modules
QtQuick3D, QtRemoteObjects, also enable Harfbuzz and Assimp
Change-Id: I26e0f60afad40e66f858f99e8e7c852ac5fd9fbb
Reviewed-by: Simo Fält <simo.falt@qt.io>
| -rw-r--r-- | coin/platform_configs/integrity.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qtquick3d.yaml | 5 | ||||
| -rw-r--r-- | coin/platform_configs/qtremoteobjects.yaml | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index cbdf2fcf..8e5060e3 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -7,7 +7,7 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64', + 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64', 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index c3233842..82ab0218 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + integrity.yaml +] Configurations: [] diff --git a/coin/platform_configs/qtremoteobjects.yaml b/coin/platform_configs/qtremoteobjects.yaml index c3233842..82ab0218 100644 --- a/coin/platform_configs/qtremoteobjects.yaml +++ b/coin/platform_configs/qtremoteobjects.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + integrity.yaml +] Configurations: [] |