aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2336-0/+0
| | | | | Change-Id: I66530634e78280ed50b2036428df0f29176788c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2236-0/+0
| | | | | Change-Id: I1fbf348a2ce336d230c67cc8ed03fae05d725f29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2136-0/+0
| | | | | Change-Id: I91aab3d9a572326775c0a2c37383d77918984893 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2136-0/+0
| | | | | Change-Id: Ic85a2785a837d73507e866a2f3a3b1b29f21ea54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2035-0/+0
| | | | | Change-Id: Idc0e457695645fc8fed9a93ca83ee5437f25a1d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2036-0/+0
| | | | | Change-Id: I5e0d932100ae441de15fa7346311b9165c4ed4c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Coin: Add tqtc-qmlcachegenplus configuration fileUlf Hermann2021-07-141-0/+3
| | | | | | | | Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit fab470c190bbceb85b1afc9794b085e57b069f1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-1336-0/+0
| | | | | Change-Id: I7e358268f00769e5acd31546a31df315bab4908d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Update provisioned CMake to version 3.20.5Alexandru Croitor2021-07-094-19/+19
| | | | | | | | Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d7c2951de0bf7c0ab5f99b46686285765f3729f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add qtwebengine dependencies to provisioningAllan Sandfeld Jensen2021-07-064-5/+18
| | | | | | | Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3f551fedd6d4553dc9187b2aaaaf8fb10a15f03a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qtpurchasing submodule from qt5v6.2.0-beta1Assam Boudjelthia2021-07-012-7/+0
| | | | | | | | | | | | | Qt purchasing was not part of Qt 6, and will be moved as a demo/example under qtdoc, thus we don't need it here. Task-number: QTBUG-84776 Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> (cherry picked from commit eb16fe519f21c1c60bcbbadf5a318d0765ded166) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add correct version for prebuilt OpenSSL AndroidHeikki Halmet2021-07-011-2/+2
| | | | | | | | | | | | | | Script was pointing to incorrect version and the prebuilt version was missing from cache. OpenSSL Android is now rebuilt and cached. Pick-to: dev Pick-to: 6.1 Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Task-number: QTQAINFRA-4501 Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-3035-0/+0
| | | | | Change-Id: I47b98b1e84927a50f99dbda1832d14d2a70a7345 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-3036-0/+0
| | | | | Change-Id: I83f3659feace8cd95ef1208886602b4a0734059c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove qtandroidextras.yaml from platform_configsAssam Boudjelthia2021-06-291-3/+0
| | | | | | | | | | | | Following qtandroidextras removal in the commit 912fdda4a4e817ec89c24da3238af600a4fbae9e, coin's platform config yaml file has to be removed. Task-number: QTBUG-84382 Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit f1fcb89f268a4e617514731b1a50334d63eca342) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-291-0/+0
| | | | | Change-Id: I2a38867ad47eb01b5f1a1e65988469ac13aa3089 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Build QDB without icu or system doubleconversionSamuli Piippo2021-06-281-3/+3
| | | | | | | | | ... to avoid unnecessary dependencies. Pick-to: dev Change-Id: I607f034d5b092e69e7d2aead4c0747268b690a5d Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-2636-0/+0
| | | | | Change-Id: Ic310607b215a1ca819f2145ffd965f282f05507b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make QtMultimedia depend on shadertools and recommend qtquickcontrols2Lars Knoll2021-06-251-2/+2
| | | | | | | | | | Multimedia needs shadertools for building, so make that explicit. Some examples use Qt Quick Controls, so we recommend that as well Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 4131439fb9635cac602a0783abd594e8e7e50f2e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing wasm target build for windows and macOS hostsJani Heikkinen2021-06-252-26/+44
| | | | | | | | | | Based on wasm maintainer these should work already Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit bae9580da1c35b47fc46e465b5b24c84737d073c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-2336-0/+0
| | | | | Change-Id: I82c549410e7c80d76975e9faaf5966d29cd75e28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: update Squish packagesTanja Remes2021-06-222-10/+7
| | | | | | | | | | | Custom packages for Qt6.2. macOS:use custom build Qt5.15 package with separate Squish server adjusted for Qt6.2 Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 1c17b656e0c7b3f5fae598a0915fdebfeb822dae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5v6.2.0-alpha1Qt Submodule Update Bot2021-06-2237-0/+0
| | | | | Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Yocto toolchainsHeikki Halmet2021-06-181-12/+15
| | | | | | | Pick-to: dev Task-number: QTQAINFRA-4459 Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Switch back to RedHat 8.2 for Android targetHeikki Halmet2021-06-181-1/+1
| | | | | | | | | Timeout increased so this should be ok to move back to Redhat 8.2 Pick-to: dev Task-number: QTQAINFRA-4415 Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* 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>
* WoA: Build both release and debug configs for Windows on ARMAlexandru Croitor2021-06-161-1/+1
| | | | | | | | | | | | The config is marked as Packaging, but it didn't specify the list of CMake configurations to build and defaulted only to Debug. Task-number: QTQAINFRA-4492 Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 52eebe8a892bfb9f2cd2070147f6f9100c02468a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add static platform targets for qdbSamuli Piippo2021-06-161-2/+29
| | | | | | | | Static host platforms with packaging enabled. Change-Id: I137bde6ccefb960282c5a830eb3862f03ee2f5f5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Remove qtandroidextras submoduleAssam Boudjelthia2021-06-152-8/+2
| | | | | | | | | | Remove qtandroidextras from the submodules list of qt5 since it's not part of Qt 6. Task-number: QTBUG-84382 Pick-to: dev Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382 Reviewed-by: Simo Fält <simo.falt@qt.io>
* coin: Make macOS on ARM developer-build tests significantTor Arne Vestbø2021-06-152-3/+14
| | | | | | Pick-to: dev Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Remove Insignificant flag from Windows ARM targetHeikki Halmet2021-06-141-1/+1
| | | | | | | Pick-to: dev Task-number: QTQAINFRA-4452 Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix qtmultimedia statusJani Heikkinen2021-06-141-0/+1
| | | | | | | | It has to be addon Pick-to: dev Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Restore qtmultimedia as a addon in qt5.gitJani Heikkinen2021-06-122-1/+0
| | | | | | | | | | According to plan Qt Multimedia will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93129 Pick-to: dev Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update submodules on '6.2' manuallyJani Heikkinen2021-06-1137-4/+4
| | | | | | | | Submodule update bot didn't do this because of some reason so try this manually instead Change-Id: Iaaad962fec9e56f0a46ab7934c9172eefd328322 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add 'Packaging' feature for Mac TestOnly CI configsSimo Fält2021-06-091-4/+4
| | | | | | | | | | 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) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Quick3D : Add optional dependency to QtQuickTimelineInho Lee2021-06-091-0/+1
| | | | | | | | | | Quick3D's runtime asset animation needs QuickTimeline module. This is an optional module just for the animation feature. Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 6069cf9a84519f907c83d8d919e8eeca634c337f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adjust submodule branchesJani Heikkinen2021-06-091-40/+40
|
* Provisioning: Install libdlt-devDominik Holland2021-06-081-0/+2
| | | | | | Fixes: COIN-217 Change-Id: I3ce5da4d6b8e79a766ad90715462a9c8b7c50294 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Add a platform config file for Qt DLT LoggingDominik Holland2021-06-071-0/+3
| | | | | Change-Id: I6ad13ba724158719c463d1e64e9aa21e59cd89c9 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
* Add a platform config file for Qt Interface FrameworkDominik Holland2021-06-071-0/+3
| | | | | | Task-number: AUTOSUITE-1633 Change-Id: Ie960510ac3c7e53c6e1b8cdbac26a339b72d31d5 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Replace openSUSE 15.2 with 15.3Tony Sarajärvi2021-06-0721-9/+12
| | | | | | | 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>
* coin: Provision OpenSSL as universal build for macOSTor Arne Vestbø2021-06-073-9/+98
| | | | | | Fixes: QTBUG-93205 Change-Id: Ic1f4d7709139da06cdd05605613602c1b28306b6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qtwinextras submodulesTor Arne Vestbø2021-06-072-7/+0
| | | | | | | | It's no longer part of Qt (as of Qt 6) Task-number: QTBUG-89564 Change-Id: I302c58f1b6a55797cf1f6722eafe936561bf456f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Restore qtwebview as a addon in qt5.gitJani Heikkinen2021-06-072-1/+1
| | | | | | | | | | According to plan Qt Webview will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93222 Change-Id: I20a20e74f08327a15d6c3985a42efc01b01a5848 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Switch webview builds to cmakeMichal Klocek2021-06-041-0/+3
| | | | | | Task-number: QTBUG-88620 Change-Id: I77bc7ad283d6b33590cc27e23dead7aac301fec9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add Integrity target for QtBase including provisioning changesHeikki Halmet2021-06-045-16/+45
| | | | | | | | | | | | At this point let's add only target for QtBase. Target for QtDeclarative, QtQuick3d and QtQuickcontrols2 will be added later when we have all required fixes. Task-number: QTQAINFRA-3555 Task-number: QTQAINFRA-4285 Change-Id: I59ef76079e98ba428cdb7abcb2560f434c37f517 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Use CentOS 8.3 when running tests with Android emulatorHeikki Halmet2021-06-021-1/+1
| | | | | | | Rhel 8.2 with Android emulator seems to be unstable Change-Id: Ibd858b25959b397d68e3242df0bf49eda3ca9445 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update build tools and platforms API level to 29Assam Boudjelthia2021-06-014-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>
* Fix --mirror option for init-repositoryLi Xinwei2021-05-311-2/+4
| | | | | | | | | | | | | | | If submodule url is absolute, don't use mirror, don't set remote.gerrit.url and remote.gerrit.fetch. To avoid error when passing "--mirror git://github.com/qt/": fatal: remote error: qt/https://code.qt.io/playground/qlitehtml is not a valid repository name Visit https://support.github.com/ for help amends 7374ef8e38b6b47589ff4f2977f102fc63ab3d72 Change-Id: Ifb4e1c8de57c7729f2965c16388f1acd763a150f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* 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. Pick-to: 6.1 Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Matti Paaso <matti.paaso@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 13:07:54 +0000