diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-04-26 11:15:09 +0000 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-04-26 11:15:09 +0000 |
| commit | 5a8d37b64d18740ef6d4ff182f0127a749e1c15d (patch) | |
| tree | 46f93bf7dcd4edf7a7aa31217bac2da938f3aea7 | |
| parent | 74566931f212b419b49c3632a68bf3639a2ddc87 (diff) | |
| parent | 015c698775e4a015c17a640732b47a644be29aa7 (diff) | |
Merge branch 6.0 into pyside6.0
Change-Id: I46f93bf7dcd4edf7a7aa31217bac2da938f3aea7
| -rw-r--r-- | coin/platform_configs/cmake_platforms_qemu.yaml | 6 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquickcontrols2 | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 26dcb085..f691556e 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -6,7 +6,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests'] + Features: ['Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-;DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', @@ -22,7 +22,7 @@ Configurations: Target arch: 'arm64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests'] + Features: ['Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../../environment-setup-aarch64-poky-linux', @@ -38,7 +38,7 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests', 'DisableTests'] + Features: ['Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../../environment-setup-mips64r2-poky-linux', diff --git a/qtdoc b/qtdoc -Subproject ee1dd582a9c121ca9a520fa54aaf349839ceb96 +Subproject 5dcb4a0caad00eab8df9cdb16880c2ed8b6a705 diff --git a/qtqa b/qtqa -Subproject 95d33e445703f0322466d199ef8e259d9714a64 +Subproject 4239183b2367db4f73f23ca0e5a2466d0aca258 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject bb7ef004ae52f9d6fc78608fd5c7be503139569 +Subproject 06eefa58c987068651fc4bd0063d12217854369 |