aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* coin: Update provisioned qdoc, qtattributionsscanner binariesTopi Reinio2022-02-111-3/+2
| | | | | | | | | | | | Latest qdoc introduced a new command (\qmlvaluetype) used in qtdeclarative documentation, as well as other fixes and improvements. Change-Id: I6453468fb36dbe38d62f5eb9de74beffd568673b Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 69b329a55f4b9e60b4269023ece519d92d070ce4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update tqtc-android-automotive targets and add test targetAssam Boudjelthia2022-02-101-2/+47
| | | | | | | | | | The module is android specific and thus tests need to be disabled for platforms other than Android Automotive. Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 69536e4b45633892a788265af393cbd36385c35d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove old Windows 10 targetsHeikki Halmet2022-02-046-133/+0
| | | | | | | | | | Windows 10 21H2 is now significant for all targets Task-number: QTQAINFRA-4539 Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit ac2bdfb93a84f07d3fb4ed9edce8409dcabcac1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make Win 10 21H2 Environment variables to match with the old Win 10Heikki Halmet2022-02-043-5/+17
| | | | | | | | | Fix few differencies. E.g. Conan env variables are missing Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 0e641142c1d5f6c98a8140ed65862cb377ce6d91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Set correct Emscripten environment variablesHeikki Halmet2022-02-041-8/+13
| | | | | | | | | | | | Needed environment variables are set during emsdk installation when installation is done using emsdk.git. But those are not set as permanently. To have correct values we need to get them from install environment and set them permanently for build environment. Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 88cde9e5003c1235bcceb8e723d518558dbd68e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Upgrade Xcode and Command Line Tools version to 13.2Heikki Halmet2022-02-042-4/+3
| | | | | | | | | | Xcode 13.2 works only in macOS 11.3/12.0 or newer Task-number: QTQAINFRA-4607 Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 72997d7039f5ce77fc5eca06152d38f70510bde4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: Start using latest macOS 11 version 11.6Heikki Halmet2022-02-0447-4/+4
| | | | | | | | | New tier 1 image's name format is qtci-macos-11-x86_64 Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit 1865d70ef892d3a06e7aef4f0861e28f0812dc2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Pass QT_BUILD_EXAMPLES instead of BUILD_EXAMPLESAlexandru Croitor2022-02-032-6/+6
| | | | | | | | | | | | | | BUILD_EXAMPLES was the old way to disable building examples, which is not used anymore. This should remove the warning about an unused BUILD_EXAMPLES variable. Fixes: COIN-762 Change-Id: Icf88d617e564939bcff5047f83d029e93df16401 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit ec6e186d10ee5766b75d92e1043fefaf2a6f91eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make Windows 10 21H2 significantHeikki Halmet2022-02-011-4/+4
| | | | | | | | Task-number: QTQAINFRA-4600 Change-Id: I0ffe3f94bfef9c15a1cbc98cd0afed8bf33c68c1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 279841383d0cd8c852bf25415aaf2747c932710d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change Windows 11 targets Insignificant flag to cover only autotestsHeikki Halmet2022-02-011-4/+4
| | | | | | | | Task-number: QTQAINFRA-4673 Change-Id: Ia841fec1fe4adcedf0af2ddfeeb9a19fd915baf7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 10897d6514e00e80c95c8d3a968a20c6b9199686) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix linux static tests config to actually runAlexandru Croitor2022-01-311-1/+1
| | | | | | | | | | | | In 3c38cc22ce504b221939a1cfa1e37db58010e749 the dash was accidentally removed and Coin was happy with it. Reintroduce the dash. Change-Id: Idc5d3833191b0390e2d0aa480681a5350d289037 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 93afb606b4a6f9a3aa8b6acff786a001ce447e0b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CI: Add font support for QNX qemuPasi Petäjäjärvi2022-01-305-1/+31
| | | | | | | | Task-number: QTBUG-99168 Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 848a7d5fa3da1fdc2d1760dc780cdb4499915749) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CI: Enable developer build for QNX x86_64Pasi Petäjäjärvi2022-01-301-1/+1
| | | | | | | | Task-number: QTBUG-99168 Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 7486226c7a3885e25c0298170073e08748c55c89) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CI: Update libraries because of new QNX toolchainPasi Petäjäjärvi2022-01-301-1/+2
| | | | | | | | | | | QNX toolchain provides newer libfreetype which depends on new libbz2 library (qnx710-20211207-linux.tar.xz). Task-number: QTBUG-99168 Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 2592bbe8c488e2ffe1108a1d936e35f663d41e04) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CI: Increase size of QNX qemu image for data partitionPasi Petäjäjärvi2022-01-301-1/+1
| | | | | | | | | | Some of the autotest require more free space to pass Task-number: QTBUG-99168 Change-Id: Iff4a4493e75d2770d691b936547143518a80e315 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 4a5550cc035b6f2e4e7e14369620c1787bbe1521) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add yaml file for Android AutomotiveJukka Jokiniva2022-01-191-0/+3
| | | | | | Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 06b5cd95e602062193995e4409a86c88837f895c)
* Provisioning: Install up-to-date google Chrome for Wasm auto testsHeikki Halmet2022-01-121-0/+51
| | | | | | Task-number: QTBUG-99062 Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Change installation order between libicu and gtk3Heikki Halmet2022-01-111-3/+3
| | | | | | | | | | Gtk3-devel includes dependency which conflicts with libicu-devel. Changing installation order should solve it Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 1e8939b4b2a07e8d115fc3b2c91b00d499925df4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provision conan on arm macOSToni Saario2022-01-072-0/+12
| | | | | | | Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit 81dcae4f9370495c648c55669c7d439edd150239) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove Insignificant flags from Creator, flashing-wizard and saferendererHeikki Halmet2022-01-043-4/+4
| | | | | | | | Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 854e478223e1b0f00f23c807d4435e6e5be9d9f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add OPENSSL_ROOT_DIR for macOS Android targetsHeikki Halmet2022-01-041-3/+3
| | | | | | | | | | | Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable. Task-number: QTBUG-97243 Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit ebb983645156dbadc9427f74950f87a3279098fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make macOS 12 on ARM developer build tests significantHeikki Halmet2022-01-031-1/+1
| | | | | | | | | | Task-number: QTQAINFRA-4649 Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 000691d833e95ef845c0f27f02dfc876d6cc4c7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Move all builds over to macOS 12Tor Arne Vestbø2021-12-232-36/+26
| | | | | | | | | Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit b19b02173c7b8cf44d880b32b7f70f2ef9d8e8a3) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Replace .ci.local suffix with .ci.qt.ioHeikki Halmet2021-12-236-7/+7
| | | | | | | | | Plan is to terminate .ci.local soon Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit d4cb44ad71d369c0b3f60a34a180648cebe6a867) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* coin: Make macOS 12 on ARM packaging tests significantTor Arne Vestbø2021-12-211-1/+1
| | | | | | | Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ccf24d5f2a865b0510eea970dd0d398f455af49d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add qt-conan-common platformsToni Saario2021-12-201-0/+3
| | | | | | | Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> (cherry picked from commit 099f184880f7f505985ccb4c31374e5124006352) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace LGPL2.1 only header with LGPL3 oneKai Köhne2021-12-20305-3999/+5829
| | | | | | | | | | This is in line with e.g. qtbase. Also remove outdated/unreferenced license files. Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit becb423e809130fe5d735dc4b66d6195caa40567) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: Upgrade Xcode to 13.2Ville-Pekka Karhu2021-12-196-12/+9
| | | | | | | | Task-number: QTQAINFRA-4607 Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit fe35c4dbb0e4b3a590be8a1426b482bfefbfbc5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS provisioning: Disable bluetoothVille-Pekka Karhu2021-12-196-0/+48
| | | | | | | Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 20c580e5db1352bc2abfd84975c6edd9d700349d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove InsignificantTests flag from Windows 10 targetsHeikki Halmet2021-12-181-2/+2
| | | | | | Change-Id: Ib6ec59762f1188d1dc2a133fdf44628d47fd1b57 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit ccf269f5da51c40f6902988fdeadaf13590d5476)
* Upgrade MSVC 2019 and build tools versions to 16.11.8Heikki Halmet2021-12-171-8/+7
| | | | | | | | | Task-number: QTQAINFRA-4704 Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 9d09f9cee93979f790007f5b7256356082fdec4a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove Rhel 8.2 targetsHeikki Halmet2021-12-165-83/+0
| | | | | | | | | | Rhel 8.4 is already in use Task-number: QTQAINFRA-4515 Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b730181404e2bab57754878de9cbec10144a9cee) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* CI: Add image support for QNX qemuPasi Petäjäjärvi2021-12-151-1/+15
| | | | | | | | Task-number: QTBUG-99168 Change-Id: If040af8d074e7e197449eb4be68507e83214d393 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 1cb9c1caef4aa6d3ed6522aef8269e08e0425e0a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CI: Add timezone support for QNX qemuPasi Petäjäjärvi2021-12-152-0/+8
| | | | | | | | Task-number: QTBUG-99168 Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 10a443c181885eee6a9e5e4025a510eb42b28895) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 configAlexandru Croitor2021-12-141-2/+1
| | | | | | | | | | | | | | | ... and remove ANDROID_{SDK,NDK}_HOME as they are deprecated and might not work even. Amends 7e2882d0a7a53ecf4b234a53bf891dfed2291cbe Augments d59825d250c0570f4c26da6908b471ccdd0faf01 Task-number: QTBUG-97002 Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6e7de2b76c4db94504b9efe9088c455809d01208) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove duplicate MinGW environment variablesHeikki Halmet2021-12-141-2/+0
| | | | | | | Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 5ce8c724d2c51d896271a3a562f10de1fe151d87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add tqtc-qtdigitaladvertising platformsToni Saario2021-12-141-0/+3
| | | | | | Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52 (cherry picked from commit 1a1028ea20bc36d97177f3cd571727bf8d852d03) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* CI: Add inotify support for QNXPasi Petäjäjärvi2021-12-144-0/+21
| | | | | | | | | | | Adds Filesystem event manager server to image and also add HOME env varbiable for root user. Task-number: QTBUG-99168 Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 06edc60e1ddb1503cab2ad0434b92f0cb053ac41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: Enable keyboard navigation between controls on macOSVille-Pekka Karhu2021-12-116-2/+18
| | | | | | | Task-number: QTQAINFRA-4660 Pick-to: 6.2 Change-Id: I12f2995c797e573d5072145c100ee64e98e133ce Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QNX: Update QNX toolchainMarianne Yrjänä2021-12-111-2/+2
| | | | | | | | Timezone database added for tests Pick-to: 6.2 Change-Id: I406e1ae0e9d1553f1588413d9cd20920674a907c Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
* Provisioning: Update emsdk to 3.0.0Morten Johan Sørvig2021-12-092-3/+2
| | | | | | | | | | | emsdk 3.0.0 is the minimum/recommended version for Qt 6.3. The python/node/jre versions appear to be unchanged. Remove the unused versionTag variable. Change-Id: Ic7b72691295040f899a22c54066b0aea3995cd7a Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Provisioning: Install addtional Python 3.10.0 for Windows 10Simo Fält2021-12-081-0/+2
| | | | | | Pick-to: 6.2 Change-Id: Ied45a786c220a1a331e7546720d72db473ce504d Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Change compiler MSVC2022_PREVIEW to MSVC2022Heikki Halmet2021-12-071-1/+1
| | | | | | | | | MSVC2022 official relase is already available in Windows 10 21H2 Pick-to: 6.2 Task-number: QTQAINFRA-4540 Change-Id: I7d7a480c4077026e7a48acf706baa62623c32c72 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Install emsdk using emsdk.gitHeikki Halmet2021-12-044-122/+32
| | | | | | | | | | This will reduce the manual work when updating emsdk version This requires also python certificates to be installed Pick-to: 6.2 Change-Id: Id33d73f67f3312a27e9660522e7ca7ce17a89dbc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Replace Windows 10 21H1 with Windows 10 21H2 in CIHeikki Halmet2021-12-0497-30/+614
| | | | | | | | | | | | | | | 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>
* coin: Make macOS 12 on x86_64 developer build tests significantTor Arne Vestbø2021-12-041-1/+1
| | | | | | Pick-to: 6.2 Change-Id: Ia148ae783006fb5b1b13f29879df78985cd75ecd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Set Conan V2 modeToni Saario2021-12-032-0/+2
| | | | | | | | | V2 mode causes conan to raise error when an feature that is being deprecated in conan V2 is used. This allows maintaining V2 compatibility. Pick-to: 6.2 Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Enable conan revisions modeToni Saario2021-12-031-0/+1
| | | | | | Pick-to: 6.2 Change-Id: Ic6e6070df62a45820e152123cf7bd82f51c226b2 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Remove existing conan settings fileToni Saario2021-12-031-0/+3
| | | | | | | | | | Due to existing conan file new versions of compilers etc. cannot be used. Forcing Conan to generate a new one will allow using the new versions in profile files. Pick-to: 6.2 Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update conan on windowsToni Saario2021-12-032-33/+8
| | | | | | | | This is required for the upcoming conan integrations. Pick-to: 6.2 Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af Reviewed-by: Simo Fält <simo.falt@qt.io>