diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:30:41 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 14:04:47 +0200 |
commit | 14d2852597f7c869e91db2f54d954965af6083fb (patch) | |
tree | 035bccb3e28f31abef1b1e39a4ca384726d2fb76 /coin/platform_configs/qtbase.yaml | |
parent | 8c2ecdbc27532cf875cf47ce75654be98b3d7e20 (diff) | |
parent | 1eae3c41854294216e600f3f4a7dfc3987d30d0b (diff) |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.gitmodules
Ignore qtquick3d for now.
coin/platform_configs/default.txt
coin/platform_configs/default.yaml
coin/platform_configs/qtbase.txt
coin/platform_configs/qtbase.yaml
We use yaml files for configurations now.
Adjust the configurations for Qt6 as it was
done before in the .txt files.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
Diffstat (limited to 'coin/platform_configs/qtbase.yaml')
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml new file mode 100644 index 00000000..16fa518d --- /dev/null +++ b/coin/platform_configs/qtbase.yaml @@ -0,0 +1,20 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'arm64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-openSUSE-15.0-x86_64' + Target os: 'WebAssembly' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten' |