diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
| commit | 13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (patch) | |
| tree | 7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/platform_configs/qtdeclarative.txt | |
| parent | a268fb46895f694a58da2389fd47ca393a68deef (diff) | |
| parent | 2fb0e4f3521327d7d44b012316fb9e79c11f4366 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.
Conflicts:
.gitmodules
Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
Diffstat (limited to 'coin/platform_configs/qtdeclarative.txt')
| -rw-r--r-- | coin/platform_configs/qtdeclarative.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index a36c94a5..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -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" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -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 -no-xcb |