aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '6.1.2' in qt/qt56.1.2Qt Submodule Update Bot2021-07-091-0/+0
| | | | | Change-Id: Ifa7ffe75ef9214f17a635522d8bd0781e3355d7e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1.2' in qt/qt5Qt Submodule Update Bot2021-07-071-0/+0
| | | | | Change-Id: Id7df750f7031fb0544b5a289bb31defeddea1328 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1.2' in qt/qt5Qt Submodule Update Bot2021-07-061-0/+0
| | | | | Change-Id: I93034dc42975d43090783c41f8e3b21cfbc91d14 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1.2' in qt/qt5v6.1.2Qt Submodule Update Bot2021-06-282-0/+0
| | | | | Change-Id: I08ef28a18adc3f7b7c02dc80cba6c990909e0636 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1.2' in qt/qt5Qt Submodule Update Bot2021-06-222-0/+0
| | | | | Change-Id: I4a9d0ec894c7df8317b42e446c7711dabe5b58cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1.2' in qt/qt5Qt Submodule Update Bot2021-06-221-0/+0
| | | | | Change-Id: I2193724c8541e36e97aaa9645d7eb3a565f7ef46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1.2' in qt/qt5Qt Submodule Update Bot2021-06-1825-0/+0
| | | | | Change-Id: Ie6e68e1d3f9936d79be2ca856c29cb82bc79f8c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge remote-tracking branch 'origin/6.1' into 6.1.2Jani Heikkinen2021-06-184-0/+0
|\ | | | | | | Change-Id: I636cde20f785a5dc3b0c6d32416de469d4e7f1ff
| * Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-06-184-0/+0
| | | | | | | | | | Change-Id: Ib883c81bceb21961cc93a54c2fc0a775fc993f40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Adjust submodule branchesJani Heikkinen2021-06-181-24/+24
|/ | | | Change-Id: I1c9976b864b980a607564225ec64f9d0311aa32e
* Archive global and config from qtbase in doc buildToni Saario2021-06-161-2/+10
| | | | | | | | | | | | Copy the global and config folder from under qtbase to directory from which the documentation.tar.gz is created. This is similar to how these are added in qmake builds. Task-number: QTBUG-94443 Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7ed6d04410d5f6d1db2a92332baadf0e42b81f40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-06-1624-0/+0
| | | | | Change-Id: I52f9c62ba46d5ac4a1808906f0a698b8e1129ce1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-06-1624-0/+0
| | | | | Change-Id: I3603941fb853f5073463731cfa48ed2b243ee137 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-06-1624-0/+0
| | | | | Change-Id: I2acc33d7bd602f4d1fa8332100dc9927efe295fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-06-1524-0/+0
| | | | | Change-Id: I0863abdc1f98725512f0b8e55c0f6527198a03bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-06-1525-0/+0
| | | | | Change-Id: I62578e0fb857e7a338517b75aebfea4de69a1cbe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add 'Packaging' feature for Mac TestOnly CI configsSimo Fält2021-06-101-3/+3
| | | | | | | | | This will allow exporting the testlogs for release. Task-number: QTBUG-94111 Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 96733116263e30d83e6eb9ad7007a7c6aa55a21d)
* Replace openSUSE 15.2 with 15.3Tony Sarajärvi2021-06-0820-6/+9
| | | | | | | | | Task-number: QTQAINFRA-4477 Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit d9be0951b439a059e01165102ee3719b845e07d7) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update build tools and platforms API level to 29Assam Boudjelthia2021-06-024-8/+8
| | | | | | | | | Windows and macOS hosts were still using 28 while Linux uses 29. Change-Id: I36afd17277605b6478bf840340c0341a7f327caa Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 53220710f5e4487c10db908abc20c515aadeb99e) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Provisioning: Upgrade OpenSSL version to 1.1.1kHeikki Halmet2021-05-314-12/+13
| | | | | | | | Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 0e9f48919216edc2c1e1c7254de766d021c1eee6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-315-0/+0
| | | | | Change-Id: I8de74a92b3679d9e4ca6d645227c7eb071f6fb87 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* COIN: Remove unused parameters from qt-creator.ymlEike Ziller2021-05-281-20/+8
| | | | | | | | | | | | | We are not using them for the Qt Creator build, since for us it makes more sense to define these things in the Qt Creator branches. They create additional noise (and confusion) in the COIN interface though, so remove them. Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Matti Paaso <matti.paaso@qt.io> (cherry picked from commit 3b2dd1560c9009c0c181a8a1dc35296aa87c79e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-2824-0/+0
| | | | | Change-Id: I1a7b35553ac88e3b3235a35e51debbd36f8e5b79 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-2824-0/+0
| | | | | Change-Id: Idf5d450bb4fa034c07a0035f050b6619765de74c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-2725-0/+0
| | | | | Change-Id: I6ee55616fe92516197172de136108257a95581e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove InsignificantTests flag from Windows developer buildHeikki Halmet2021-05-271-1/+1
| | | | | | | | | | Let's remove this flag from dev branch with separate patch when fixes are landed Pick-to: 6.0 Task-number: QTQAINFRA-4427 Change-Id: I0ee7c6df6e0bc7cf9facda005e11644cd9174e41 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-2719-0/+0
| | | | | Change-Id: I76abbd02844aff206b230d0a29fa4b71b1ab3d8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-252-0/+0
| | | | | Change-Id: I98385c5640088fdf2b2d4316db72bdae7417dbf5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-2526-0/+0
| | | | | Change-Id: I2f076f1529b5eed5ee1cbf5814b2607c25fccb1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix used Ubuntu version for Pyside6 license checkSimo Fält2021-05-242-2/+2
| | | | | | | Change-Id: I9f966089818559178d6e1e2c286da25bbd8219e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit ce66a834855b622e49a9fc5b56d09d0cd310bb0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Libusb coin provisioningDan Ackers2021-05-244-4/+22
| | | | | | | | | | Include libusb to linux, macos and windows Task-number: QTBUG-90951 Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 2cee9da977f4f8f0f5878839f7d150735e9bd691) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-2026-0/+0
| | | | | Change-Id: I2886b2354f53b9654e5b2d0475cb74bc3a30eec6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-203-0/+0
| | | | | Change-Id: Ide6481d4878a6314dadc87162c308057a0a0ccac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1924-0/+0
| | | | | Change-Id: I6ab234020be39f1149315f8a996d19727caf6178 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1926-0/+0
| | | | | Change-Id: I8528c0fbb030b11f1643e0a1789437720d9a8819 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1824-0/+0
| | | | | Change-Id: I135ce3a06030b03ddf70bc848c5bb0bcb6b13022 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1825-0/+0
| | | | | Change-Id: Id315cdbc1af326fe4659c1d3c168b8c59f033229 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-172-0/+0
| | | | | Change-Id: I1bec0831d8607d24ffac6cb35c0b6bf07aa5d5bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Temporary fix for installing Conan packages in WindowsHeikki Halmet2021-05-173-147/+18
| | | | | | | | Task-number: QTQAINFRA-4443 Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 99a81d0c6c4b3f8b5045d3b93f74b3cade64ab11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1325-0/+0
| | | | | Change-Id: Ic1bbf9be97d538cf9d88fc34d1b88142713de7f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1324-0/+0
| | | | | Change-Id: Ib7307071e10f37b3cf094033b2ea95fc3999dc01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1325-0/+0
| | | | | Change-Id: I3365c9d55dc718bbbd7871e37ee649985b7fb470 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1224-0/+0
| | | | | Change-Id: Iaac20c6249e4a00b502e5c5425fe0511168d1989 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1224-0/+0
| | | | | Change-Id: I6de91b63d2214470ca45c6a1fce0fc7cbd8af927 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1124-0/+0
| | | | | Change-Id: If60312b5c4fb6182631f3d8664cbaefc3fd74085 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1118-0/+0
| | | | | Change-Id: I9b70d0a06887f24b3d42d8662fdb2bcddfda731a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-1125-0/+0
| | | | | Change-Id: I033c9435eece1c072d02d96baeb6e29695f66f19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-0725-0/+0
| | | | | Change-Id: Ide93708ae5d95f77df85a130b5de546b2d46c1fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-0624-0/+0
| | | | | Change-Id: I974aa7d1bd44204056b11695fe01ec92cfd67932 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.1' in qt/qt5Qt Submodule Update Bot2021-05-0625-0/+0
| | | | | Change-Id: Ie75121f5d762ba51e0fead50f20d0f80b2a7e9fb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>