From f08bd26eebe928b86cb1819126c232af02e10ab5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Aug 2019 23:31:00 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 309c3139..6388eb98 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 309c3139f8111ea246dd3a1f996578d0b35bb151 +Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 diff --git a/qtbase b/qtbase index 3d7bd7ad..36cc171b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3d7bd7ad19254bb1c4794349e71501e58c91891e +Subproject commit 36cc171b9314bf77fc84d4273dceb6264aef7134 diff --git a/qtconnectivity b/qtconnectivity index c9d585da..406b18fd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c9d585da2ddd49108d7b56f480bcfc9d71b67dbf +Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c diff --git a/qtdeclarative b/qtdeclarative index dfc6dc1d..0647df8c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dfc6dc1d94a729f701172861a196b4b34bcd7518 +Subproject commit 0647df8c88d4eaeedd19456b6e382308208e2be1 diff --git a/qtmultimedia b/qtmultimedia index d9dd7f48..636f46f0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd +Subproject commit 636f46f04ba6d5c63783558ed78eb5f562179e9c diff --git a/qtqa b/qtqa index cacf0675..5e3b8ac7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cacf06752406afffbd358b75fb0f232f4fa613c5 +Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 diff --git a/qtrepotools b/qtrepotools index 9d734113..157ec79c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9d73411360b154e8d415b08dc0c295592a8adc00 +Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 diff --git a/qtwebengine b/qtwebengine index c3c37b4e..a2c365cb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c3c37b4e93a26748497bec1a0dc29b8358408157 +Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 -- cgit v1.2.3 From b88acae7a8e773c307e44f84da037d01d19e60f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 8 Aug 2019 10:04:18 +0000 Subject: Partially revert 'Do DeveloperBuild for Boot2Qt' This partially reverts commit 8f073cea69dde52b66577de4417fbc34db9e7476. Autotests slow down way too much still, so we can't run developers builds eveywhere. Task-number: QTBUG-63152 Task-number: QTBUG-77304 Task-number: COIN-326 Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.yaml | 4 ++-- coin/platform_configs/qtbase.yaml | 14 ++++++++++++++ coin/platform_configs/qtdeclarative.yaml | 12 ++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index d2aa8f10..640196ad 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -136,13 +136,13 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - 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' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -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' - 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' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -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-Ubuntu-18.04-x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index dbe93909..af68635a 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,3 +1,17 @@ +- + 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-windows-10-x86_64-10' Target os: 'WinRT_10' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 7c4f6722..9327b92e 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -1,3 +1,15 @@ +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'armv7' + Compiler: 'GCC' + 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' + 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-Ubuntu-18.04-x86_64' Target os: 'QEMU' -- cgit v1.2.3 From 42bfac5bf847cc7505d0bf5be2aff179ed2ed28e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Jul 2019 11:30:55 +0200 Subject: Include qtvirtualkeyboard again This partially reverts commit 452e0d94d40bba15a56293a0a0f7d093dececda9. Task-number: QTBUG-76371 Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8 Reviewed-by: Mitch Curtis --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9884474c..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -264,7 +264,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.12 - status = ignore + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative -- cgit v1.2.3