aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* coin: Make macOS on ARM packaging tests significant for a few modulesTor Arne Vestbø2021-05-185-9/+16
| | | | | | | | Not all modules pass yet, but we want to at least make the ones that do blocking. Change-Id: Ic3270bab8825c79d3315e6241d62af1bf7f62435 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add qtwebchannel configAllan Sandfeld Jensen2021-05-181-0/+3
| | | | | Change-Id: Ida06681db4cceac72c7cc5b8dcad34457399d756 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Restore qtwebsockets as a addon in qt5.gitJani Heikkinen2021-05-182-1/+1
| | | | | | | | | According to plan Qt Web Sockets will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93684 Change-Id: Idbbc0e5c553bcd863f4b8ad21b9aee6057fe139e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Change 'Target arch' for macOS universal buildJani Heikkinen2021-05-181-1/+1
| | | | | | | | | | | | | This build containing both x86_64 and arm64 architectures. The 'Target arch' ends up in the binary package names and needs to be changed because '+' is illegal character in Amazon S3 file names so replace the '+' with '-' in the 'Target arch' section. Fixes: QTBUG-93778 Change-Id: I325210d51115ae0b1eda056636b69421f68fabd8 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Remove CentOS 8.3 targetsHeikki Halmet2021-05-176-78/+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>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-1232-0/+0
| | | | | Change-Id: Ib3de299c8f75105e8df3e6d78c58ecb05649ad0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Temporary fix for installing Conan packages in WindowsHeikki Halmet2021-05-123-147/+18
| | | | | | | | | | Pick-to: 6.1 Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Task-number: QTQAINFRA-4443 Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Remove qtmacextras and qtx11extras submodulesTor Arne Vestbø2021-05-113-12/+0
| | | | | | | | | | They are no longer part of Qt (as of Qt 6), and the modules themselves have been wiped (9d99db029613d9cd847407085c5de7f310cd0937, and 6037ece5e4c0d290ae4ebf75c0d9bce0de55ed85). Task-number: QTBUG-83251 Change-Id: Ie3acfc6d31bda0fcc1c6189e08171dbdf3c50ff7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Restore qtremoteobjects as a addon in qt5.gitJani Heikkinen2021-05-072-1/+1
| | | | | | | | | According to plan Qt Remote Objects will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93139 Change-Id: Ia4c9feae94b69f01a3c36872b346aa872f0e6654 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Switch qtconnectivity from additional library to addonJani Heikkinen2021-05-062-1/+1
| | | | | | | And at same time bump qtconnectivity sha1 in qt5.git Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0519-0/+0
| | | | | Change-Id: Ie7555c2f5c1eacde17e2bee06a496c723025e34e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add ci config for Windows 10 on ArmSimo Fält2021-05-051-0/+11
| | | | | | | Task-number: QTBUG-85820 Change-Id: I145cbfbd39fe164bc57d4106e58c50add51fe976 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add test configuration of macOS universal builds on ARMTor Arne Vestbø2021-05-051-0/+6
| | | | | | Change-Id: I8dec178343978b36dce3e9d262a7f6f234513892 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0531-0/+0
| | | | | Change-Id: Ibb59bafe553eb0ca055d8d4275f476d87b4c46c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0530-0/+0
| | | | | Change-Id: I0cc9ad6d4dae1049b5d5ccba84afa4ea1ff7dbc2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0430-0/+0
| | | | | Change-Id: I32545ca7ab23266ecbf9ce26593a40bbac9a87cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0430-0/+0
| | | | | Change-Id: I76b03c8a5e6fdd3da47e35de6ea37b5f7579970a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0319-0/+0
| | | | | Change-Id: I2d83b0da164cfea2694b51f32069698d0c6780af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0130-0/+0
| | | | | Change-Id: Ifb8d58ff4677c73e5b2a0ac381a99f9bc4351dff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-05-0130-0/+0
| | | | | Change-Id: I727a0d4b9c1cc665acf9aaf5c03d168f63646398 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-3030-0/+0
| | | | | Change-Id: I8774af63fd1e96cd2e95288170a4510c3799f3ba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QDoc libclang to 12.0Cristian Adam2021-04-302-10/+10
| | | | | | Task-number: QTBUG-93203 Change-Id: I58b9af361b8e02b7210286ff3cfd6ca07ebb9610 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Provisioning: Upgrade python 3.6 version to 3.6.2Heikki Halmet2021-04-282-3/+3
| | | | | | | | | | | | typing.NoReturn is not included in python 3.6.1 version. We need at least 3.6.2 version Pick-to: 6.1 Pick-to: 6.0 Task-number: QTQAINFRA-4433 Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50 Reviewed-by: Dan Ackers <dan.ackers@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2819-0/+0
| | | | | Change-Id: Ia193a750ec32f83192170066c2da078f31d583c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Re-add Linux static config to keep build coverageAlexandru Croitor2021-04-271-0/+7
| | | | | | | | | | | | We want at least one config that ensures static host Qt builds work in the CI, even if no tests are built. Amends bead5e87205be48774f5cec6b021f0c470ee40e6 Task-number: QTBUG-87580 Change-Id: I091e85ca40faef30ddad57e2a392d65197a47027 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Build minimal subset of tests in desktop static buildsAlexandru Croitor2021-04-273-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | New cmake_platforms_static_tests.yaml file will be included in repos that support building and running a minimal subset of tests built against a static Qt. Currently it's limited to qtbase. Moved existing 'linux-SLES static' config into this new file and also added a macOS and Windows config. Skipped specifying the PostgreSQL lib path for Windows and macOS because the plugin gets automatically linked into tst_moc, but the test build phase doesn't actually call find_package for PostgreSQL and the build system generation fails. Similary skipped specifying the openssl lib location for macOS, because the module_includes cmake auto test fails to find the WrapOpenSSLHeaders package. Explicitly tag iOS static config with DisableTests. The instructions already skipped building tests for iOS, but it's better to be explicit and update the instructions not to do that anymore. Pick-to: 6.1 Task-number: QTBUG-87580 Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Provisioning: Fix nodejs installationHeikki Halmet2021-04-271-2/+2
| | | | | | | | | | | Pick-to: 6.1 Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Task-number: QTBUG-93178 Change-Id: I27f4b1aa6f382cb6c9cc97f960fe1d0b81e47fbd Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2730-0/+0
| | | | | Change-Id: Iabc6447679ee0bd1729c36457c6e5b585be9fcf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2730-0/+0
| | | | | Change-Id: I99095f78c24e7e33390357962b60674139186403 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2630-0/+0
| | | | | Change-Id: I69ea8bbff2881cdcb0cb4776c8dfec950773c46d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-261-0/+0
| | | | | Change-Id: I6cd6e5bed9d386758d69877a090b272b1e27f007 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Upgrade OpenSSL version to 1.1.1kHeikki Halmet2021-04-264-12/+13
| | | | | | | | | | Pick-to: 6.1 Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Provisioning: Fix gcc toolset source pathHeikki Halmet2021-04-261-1/+1
| | | | | | | Pick-to: 6.1 Pick-to: 6.0 Change-Id: I4e81894648c25ce629914bc4bd9ffa65681ad004 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2430-0/+0
| | | | | Change-Id: I2765de991ac8c2fed865506d44a3ca9eea2188b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2430-0/+0
| | | | | Change-Id: I02823722e7c8c24a682e8c8a63520ff0f69a64a2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2330-0/+0
| | | | | Change-Id: Ib358c3ed83afff5162f39f76a689e348bbb6d821 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove packaging flag from CentOS targetsHeikki Halmet2021-04-237-13/+13
| | | | | | | | | | 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 target arch for universal macOS targetToni Saario2021-04-231-0/+1
| | | | | | | | | This makes the field to reflect reality as otherwise it will be resolved from the template and excludes the arm64. Change-Id: I39972e47ba2a0ab9fe4322c844b60383187a762b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Update additional library sha1's to qt5.gitJani Heikkinen2021-04-2212-0/+0
| | | | | Change-Id: I92078b3664cee04c3ad9e96d02072933a21b904c Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Drop unnecessary qttools dependency from m2m protocolsJani Heikkinen2021-04-221-3/+3
| | | | | Change-Id: I5b8a169e4c96e76bc34806a8befdc83784106413 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Change all (except qtconnectivity) additional libraries to addonsJani Heikkinen2021-04-221-16/+16
| | | | | | | | | | | | | | | | It has been decided to *not* ship source-only Conan packages in Qt 6.1, but revert back to delivering the additional libraries similarly as with Qt 5. That's why we need to switch all additional libraries to addon to start building binaries for those as well in qt5.git integration. qtconnectivity will be changed when QTBUG-92990 is fixed. Task-number: QTBUG-91796 Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> (cherry picked from commit 55874781a1d66694e4db988403ae66c35041b179)
* Provisioning: Remove mac certificates and signing toolsHeikki Halmet2021-04-223-414/+0
| | | | | | | | | | | Those will be provided by Coin Pick-to: 6.1 Pick-to: 6.0 Change-Id: Id38b99b11d8b7988d743fc8a302760c3286087ff Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2214-0/+0
| | | | | Change-Id: I496885d1367ef141b14f45577fe01fb0a34c8eb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Mark QtSensors as an addonJuha Vuolle2021-04-202-1/+1
| | | | | | | | | The QtSensors is headed to Qt 6.2 and initial cmake port has been merged Task-number: QTBUG-92502 Change-Id: I9ff7062677040fd35d285373cca19515a0cb921f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add coin platform config for QtSensorsJuha Vuolle2021-04-201-0/+3
| | | | | | | | | QtSensors shall be released in Qt 6.2. The cmake port for the QtSensors is in the making and initial version should be ready soon. Task-number: QTBUG-92502 Change-Id: I0006d24447334474ae5578ce05a6dcb195e8ad49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Enable macOS target on ARM HW on all modulesToni Saario2021-04-202-8/+8
| | | | | Change-Id: I3528a2bca79f20345926e61f3eef715fc63d84e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* macOS: Build universal Qt for macOSAlexandru Croitor2021-04-203-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | Build a universal macOS targeting Intel x86_64 and Apple Silicon arm64 using the fat library technique. It will be our new Packaging configuration for macOS. Rename the Id of the configuration to 'macos-latest-xcode-universal-packaging-build'. x86_64 is the main config test architecture. The arm64 slice of the Qt build lacks certain functionality: - no qdoc, lupdate, etc due to missing arm64 llvm packages - no postgresql and odbc sql plugins due to missing arm64 3rd party libraries - no openssl due to missing arm64 library - no JIT support in QtQml, due to limitations in the current fork of the javascript engine Task-number: QTBUG-85447 Change-Id: If2a70f192a54d6f98137e05e5b938d118b6d1d1d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2021-04-2013-0/+0
| | | | | Change-Id: I5768d7983e6c75a9be576ab91c8fdebe0367b836 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add Red Hat 8.2 to CIHeikki Halmet2021-04-2038-1/+1191
| | | | | | | | | | 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>
* Provisioning: Fix Squish for Qt6 on macOSJohanna Äijälä2021-04-201-3/+6
| | | | | | | | | | Add correct Squish package to the 'squish_for_qt6' location. Pick-to:6.1 Pick-to:6.0 Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 14:12:44 +0000