aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/qtsaferenderer.yaml
Commit message (Collapse)AuthorAgeFilesLines
* Remove Windows 11 22H2 targets from CIElias Toivola2024-04-161-1/+1
| | | | | | | | | 22H2 is replaced by Windows 11 23H2. Task-number: QTQAINFRA-6113 Task-number: QTQAINFRA-6075 Change-Id: Ifd960a4c18b19f91a2624a23eacffa59c2faefac Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Add the explicit INPUT_headersclean=ON flag for non-qtbase reposAlexey Edelev2024-04-161-2/+5
| | | | | | | | | | | The 'headersclean' flag is not a "feature" anymore, so qtbase doesn't propagate it for other repositories. CI no need to set either INPUT_headersclean=ON or add -headersclean flag to the qt-configure-module script command line. Task-number: QTBUG-121722 Change-Id: I6970d6a04dd51ad4d3df114212f6410b80ddc6a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump mingw version from 11 to 13 for SafeRenderer toolingJussi Witick2023-12-181-1/+1
| | | | | | | | | Bump mingw version from 11 to 13 for SafeRenderer tooling. Mingw version was updated with the following task, but only QSR runtime was updated. Task-number: QTQAINFRA-5045 Change-Id: I385aedcd55112c3e5732189173bcdd62e777d02e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Remove RHEL 8.6 from yaml configurationsTero Heikkinen2023-10-071-10/+1
| | | | | | | | | | Removing RHEL 8.6 from yaml configurations at first and scripts will be kept for some time, until removed later. Task-number: QTQAINFRA-5768 Change-Id: I687f96de35b4bfa28d5a520717f29f059c4925c3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Remove SLES 15 SP4 from CI platform configsTero Heikkinen2023-10-021-1/+0
| | | | | | | | | | | SLES 15 SP4 scripts from pre-provisioning and provisioning will be removed later. Pick-to: 6.6 Task-number: QTQAINFRA-5667 Change-Id: Idb49075800e5c3a23804b6df8dd283af3fcbf000 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add SLES 15.5 to CI with InsignificantTests flag enabledTero Heikkinen2023-09-141-0/+1
| | | | | | | | | | | | | | | | | | SLES 15.5 will be added as parallel with SLES 15.4 until packaging site gives green light to remove the older version. Upgrade nodejs to commonly used 18.16.0 version This is following the new CI process to introduce new platforms in parallel with Insignificant flags in use. Flags removed later after flakiness has been monitored enough to give green for OS replacing. Pick-to: 6.6 Task-number: QTQAINFRA-5667 Change-Id: I66d325f0e20f536b8e8b61ce3eb9f1dbc6a9f204 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
* Replace OpenSUSE leap 15.4 with OpenSUSE leap 15.5Tero Heikkinen2023-08-291-1/+1
| | | | | | | | | | | | OpenSUSE 15.5 will replace 15.4 in yaml configurations at first and OpenSUSE 15.4 scripts are still kept for some time. OpenSUSE 15.4 scripts will be removed later. Task-number: QTQAINFRA-5666 Change-Id: Ic04dee5935b2d0ea9b99dd103f796d38ea90ba2d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Fix qsr rhel 8.4 includesToni Saario2023-08-101-1/+1
| | | | | | | | Id has since changed to 8.6. Coin now detects faulty includes and bails out if some includes are not found. Change-Id: I2a07931c80b0878d5ace26c7ad8c444d11678a0e Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Upgrade MSVC 2022 and 2019 for Windows 10 22H2Heikki Halmet2023-07-031-1/+1
| | | | | | | | | | | | Change upgrades also build tools for both visual studios MSVC 2022: 17.6.4 MSVC 2019: 16.11.27 Pick-to: 6.5 6.6 Task-number: COIN-1059 Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add Red Hat 8.8 to CITero Heikkinen2023-06-261-0/+9
| | | | | | | | | | | | RHEL 8.8 will be added as parallel with RHEL 8.6 until packaging site gives green light to remove the older Red Hat version. Removing also some obsolete package installations. Task-number: QTQAINFRA-5600 Change-Id: Ie77500a805a89db9019b5347539e662bc016af59 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Remove conan profilesTor Arne Vestbø2023-06-201-2/+1
| | | | | | | | | The conan experiment has ended, and the files are only bitrotting nowadays. Pick-to: 6.5 6.6 Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Update qtsaferenderer build configurationsTeemu Holappa2023-05-151-17/+49
| | | | | | | | Task-number: QSR-2110 Task-number: QSR-2010 Pick-to: 6.5 Change-Id: Idbf265ba461d3b383e1bae8b41f00a8cf76e4d3a Reviewed-by: Toni Saario <toni.saario@qt.io>
* Replace RHEL 8.4 with RHEL 8.6Heikki Halmet2023-05-111-1/+1
| | | | | | | | This also includes support for OpenSSL 3 for RHEL 8.6. Task-number: QTQAINFRA-5368 Change-Id: Ifeb87f840eaa0df227ae2b8c20a58c126f654d2e Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Change RHEL 9.0 to RHEL 8.4 for packaging targetsHeikki Halmet2023-01-171-1/+1
| | | | | | | | | | | | RHEL 9 is causing glibc issue with older linux distros. Let's revert back to use the older RHEL version. For Android targets we can still use RHEL 9 Task-number: QTBUG-110172 Change-Id: I6d61a550fceaab4946e27bd8806263ccfa38a6e6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 1759420accb3c67614f3d089323928437b79b3b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add RHEL 9 to CIHeikki Halmet2022-12-231-1/+1
| | | | | | | | | This will replace RHEL 8 Task-number: QTQAINFRA-5111 Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Add Windows 10 22H2 to CIHeikki Halmet2022-11-181-2/+2
| | | | | | | | | | | | Pre-installed to tier 1: MSVC 2022 17.3.6 plus build tools MSVC 2019 16.11.20 plus build tools MSVC 2015 update 3 14.0.25420.1 Task-number: QTQAINFRA-5262 Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Remove old Windows 10 targetsHeikki Halmet2022-02-041-6/+0
| | | | | | | | | Windows 10 21H2 is now significant for all targets Pick-to: 6.3 Task-number: QTQAINFRA-4539 Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Remove Insignificant flags from Creator, flashing-wizard and saferendererHeikki Halmet2022-01-041-1/+1
| | | | | | | | Pick-to: 6.3 Pick-to: 6.2 Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* Remove Rhel 8.2 targetsHeikki Halmet2021-12-131-5/+0
| | | | | | | | Rhel 8.4 is already in use Task-number: QTQAINFRA-4515 Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Replace Windows 10 21H1 with Windows 10 21H2 in CIHeikki Halmet2021-12-041-2/+2
| | | | | | | | | | | | | | | Tier 1 image includes all configurations from pre-provisioning folder. E.g. these are pre-provisioned: Visual Studio 2015 version 14.0.25420.1 Update 3 Visual Studio 2019 + build tools version 16.11.7 Visual Studio 2022 + build tools version 17.0.1 Task-number: QTQAINFRA-4651 Pick-to: 6.2 Change-Id: I738ac703d72620f84008ac8a5e5d57911d89d055 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Replace MinGW 8.1 with MinGW 11.2.0 in CIHeikki Halmet2021-10-251-3/+3
| | | | | | | | | | Note! MinGW version is 9.0.0 but the GCC version is 11.2 which is used with the naming of MinGW Task-number: QTBUG-93479 Change-Id: I318a898c49bded60bb891b73109de829cb975750 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Add Windows 10 version 21H1 to CIHeikki Halmet2021-10-111-1/+7
| | | | | | | | | | | | | | | | | | | Packaging targets needs to be parallel with older Windows 10 version until packaging site is ready to start using new windows 10 version. Inlcudes: * MSVC 2022 version 17.0.0 preview 3.1 * MSVC 2019 version 16.11.2 * MSVC 2019 build tools version 16.11.2 * MSVC 2015 version 14.0.25431.01 Update 3 Failing targets marked as insignificant Task-number: QTQAINFRA-4517 Change-Id: If841509923c2534a5bf626078b97f2d3f63a07b6 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Remove Insignificant flags from Rhel 8.4 targetsHeikki Halmet2021-08-231-1/+1
| | | | | | | | Task-number: QTQAINFRA-4516 Change-Id: Ib508de80d6cb22c5d3a8a5faf2b9614355053827 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add Red Hat 8.4 to CIHeikki Halmet2021-08-131-0/+5
| | | | | | | | | | | | Red Hat 8.4 will be added as parallel with Red Hat 8.3 until packaging site gives green light to remove the older Red Hat version. Also targets which are not tested during Qt5 integration will be set as Insignificant until proven to work Task-number: QTQAINFRA-4516 Change-Id: I3d9543da315b3d93ee8d9e37389acaf7212b00f7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Remove CentOS 8.3 targetsHeikki Halmet2021-05-171-5/+0
| | | | | | | | | Provisioning scripts will be removed later Task-number: QTQAINFRA-4415 Change-Id: I71da9743066a81638518f44dc663324246a2ce8c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Remove packaging flag from CentOS targetsHeikki Halmet2021-04-231-2/+2
| | | | | | | | | | This will also remove CentOS target under QtCreator and RHEL's Insignificant flags from submodules Task-number: QTQAINFRA-4416 Change-Id: I2e6d910dfbba7a7903b149f5cf0bc3386cd4e3e2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add Red Hat 8.2 to CIHeikki Halmet2021-04-201-0/+5
| | | | | | | | | | Red Hat 8.2 is the latest version with extended update support. In the end Red Hat 8.2 will replace CentOS 8.3 Task-number: QTQAINFRA-4322 Change-Id: Iaa2ef452e7e6608349ba7438bbc5d25ddb35fa2a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add Ubuntu 18.04 for Qt6 binary packagesHeikki Halmet2021-02-161-0/+5
| | | | | | | | | | | | | | We need to start using Ubuntu 18.04 with Qt6 binary package targets. Ubuntu 18.04 includes older GLIBC version which shouldn't cause any problems with linux distributions supported by Qt6 Tests will be executed with Ubuntu 20.04. Task-number: QTQAINFRA-4193 Change-Id: Icb189c509351ff080a2c6431299cc0be6ba8adc1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Replace CentOS 8.1 with CentOS 8.3 in CIHeikki Halmet2021-02-011-1/+1
| | | | | | | Task-number: QTQAINFRA-3964 Change-Id: I368e59867e8061ed25d4d3f10de7e995e56bd676 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update Windows 10 x86_64 version to 20H2Heikki Halmet2020-12-041-2/+2
| | | | | | | | | | | | | | | | | | Windows 10 Enterprise 20H2, OS build 19042.508 Additional SW: MSVC 2019 version 16.8.1 MSVC 2019 Build Tools version 16.8.1 MSVC 2015 14.0.25420.1 Virtio driver Virtio Balloon driver NetKVM driver Vioserial driver Guest-agent qemu-ga-x86_64 Pick-to: 6.0 Task-number: QTQAINFRA-3961 Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Use the -qmake configure argument for UseLegacyInstructions configsJoerg Bornemann2020-10-231-3/+3
| | | | | | | | ...to prepare switching the default from qmake to CMake. Task-number: QTBUG-87049 Change-Id: I0f17e65cead99d2b7bf3191b1bfc96cee7d089e9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add CentOS 8.1 to CIHeikki Halmet2020-10-161-1/+1
| | | | | | | | | | | Insignificant flag is added for two targets. RedHat 7.6 will be kept as parallel until insignificant flag can be removed from CentOS Task-number: QTQAINFRA-2760 Task-number: QTQAINFRA-3065 Change-Id: If124600309644e6a066805cd728bf12862006a21 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Update Windows 10 x86_64 to version 2004Heikki Halmet2020-08-181-2/+2
| | | | | | | | | | | | | | MSVC 2019 version 16.6.2 MSVC 2019 Build Tools version 16.6.2 Virtio driver Virtio Balloon driver NetKVM driver Task-number: QTQAINFRA-3818 Task-number: QTQAINFRA-3817 Change-Id: Id0edee66d4eb42730a70495dbb063a0d379f026c Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-301-4/+8
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtwebkit.yaml coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
| * Provisioning: Update Windows 10 x86_64 to version 1909v5.15.0-beta3Heikki Halmet2020-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | These are also updated to tier1 image: msvc 2017: Not installed msvc 2019: version 16.4.4 msvc 2019 build tools: version 16.4.4 Task-number: QTQAINFRA-3623 Task-number: QTQAINFRA-3417 Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update MinGW 7.3.0 to Mingw 8.1.0Tony Sarajärvi2020-03-231-2/+6
| | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3304 Change-Id: I4a962c112f4925224e91c08117c7324112d70729 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.yaml coin/platform_configs/flashing-wizard.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/tqtc-qt-config-gui.yaml coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
| * Provisioning: New Tier1 image for Windows 10 x86_64Heikki Halmet2019-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change will upgrade Visual studios to the latest ones. Also MSVC 2019 build tools are installed for RTA. MSVC 2019 version 16.3.10 MSVC 2017 version 15.9.17 MSVC 2019 build tools version 16.3.10 Task-number: QTQAINFRA-3389 Change-Id: Ic21645f96f8d4e6abc38951bd6bab519b4864418 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Use legacy instructions when building all qmake configurationsAlexandru Croitor2020-02-031-2/+3
|/ | | | | | | | | | | | This change is preparation for merging qtbase wip/cmake -> dev, because that will bring in the new yaml instructions on how to build the CMake configurations, which means that legacy instructions provided by Coin itself need to be used for all the existing qmake configurations. Change-Id: I7005835719b83b7186138292a2e1baf4d2a4a3e0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest versionHeikki Halmet2019-11-071-2/+2
| | | | | | | | | | | | | | Under coin/pre-provisioning can be found information what have been provisioned to tier1 image Visual studios are updated to versions: MSVC 2019: version 16.3.1 MSVC 2017: version 15.9.16 Task-number: QTQAINFRA-2875 Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-09-091-1/+1
|\ | | | | | | Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb
| * Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-09-091-1/+1
| | | | | | | | | | | | | | | | | | Add build flag '-no-opengl' to remove xcb from static build Add build flag '-no-vulkan' to disable vulkan Task-number: QSR-517 Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-09-061-1/+1
| | | | | | | | | | | | | | | | Add build flag '-no-xcb' to remove xcb from static build Task-number: QSR-517 Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-09-031-1/+1
| | | | | | | | | | | | | | | | Add build flag '-qpa offscreen' to remove dependency to xcb libraries Task-number: QSR-510 Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-08-301-1/+1
| | | | | | | | | | | | | | | | Add build flag '-no-icu' to remove dependency to icu libraries Task-number: QSR-499 Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-281-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.yaml coin/provisioning/common/linux/disable-ntp_linux.sh coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh emsdk.sh was moved from linux to unix, see 38e416be664dc216b332e6b4ff8d38905dfdc1e9 Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
| * Update Saferenderer static buildsTuomas Heimonen2019-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | qtci-windows-10-x86_64-10 static build: remove flag '-developer-build' qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig' and '-qt-freetype', remove flag '-developer-build' Task-number: QSR-491 Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Update Saferenderer static buildsTuomas Heimonen2019-08-261-2/+2
| | | | | | | | | | | | | | | | | | DisableTests on qtci-windows-10-x86_64-10 Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64 Task-number: QSR-432 Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * Add Packaging to Saferenderer static buildsTuomas Heimonen2019-08-151-1/+2
| | | | | | | | | | | | Task-number: QSR-432 Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-031-3/+3
|/ | | | | | | | | | | | | | | | | | Conflicts: .gitmodules ignore QtWebEngine on QEMU temporarily. coin/platform_configs/default.yaml no-gui build was removed temporarily. coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/qtsaferenderer.yaml Task-number: QTQAINFRA-2576 Task-number: QTBUG-77304 Task-number: QTBUG-77305 Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 13:39:55 +0000