aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Use CMake configurations as packaging onesAlexandru Croitor2020-06-173-9/+14
| | | | | | | | | | | | | | | | | | | | | | | Remove the "Packaging" feature from the qmake configurations in qt5.yaml and default.yaml. Note that "Packaging" configurations in other .yaml files are not touched yet, because there are no CMake ports for those. These are qdb.yaml, qtwebkit.yaml. qtwebengine.yaml, etc. Assign the "Packaging" feature to the closest equivalent CMake configurations we have. MinGW is not tagged with Packaging for now, because a decision needs to be made what will the Windows7 32 bit configuration be replaced with. At the moment, not every qmake configuration will have an equivalent CMake configuraiton. As a result WebAssembly goes away as a Packaging configuration for Qt 6.0. Task-number: QTBUG-85047 Change-Id: I09b6956b6b9c7393b5e095f826d72e92b81594d0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Set QT_QUICK_BACKEND=software in QEMU configsLaszlo Agocs2020-06-172-4/+6
| | | | | | | | | | | | | In Qt 6 things get more complicated because we have Vulkan, Metal and D3D in addition to OpenGL. Qt Quick will only default to the software backend when no graphics API was available at build time - and this not true for the QEMU configs because the Ubuntu env has both OpenGL and Vulkan headers, so they both are enabled, but are not usable at run time. To simplify life, just state the Qt Quick backend we want the tests run with. Change-Id: I63cd9534bc8cd5d0568235bc2035f5613d29ced4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Add a Qt namespace buildAlexandru Croitor2020-06-161-1/+1
| | | | | | | | | | | Change the ubuntu developer build to a namespace build. We need to have namespace build coverage in CMake configurations like in the qmake ones. Task-number: QTBUG-84881 Change-Id: I429a11486bd9a0c60a3d0423a9a41dc436f32f1e Reviewed-by: Simon Hausmann <hausmann@gmail.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMake: Update instruction file to accept cross-compiling configsAlexandru Croitor2020-06-161-2/+2
| | | | | | | | | | | | | | | | | | | This is needed for consistency. Previously if you scheduled a test build for a qt5.git change, the cmake cross compiling configurations would not appear and not be tested. But when staging the change, each repo WOULD start building the cross-compiling configurations, except for the qt5.git top-level builds. The current change will make sure that configurations is done both during scheduled test builds and actual staged builds. Change-Id: Ia2cbb08cee97414c39287a2ab9ff8d312dcd813a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* CMake: Deduplicate the cmake platformsToni Saario2020-06-1622-879/+82
| | | | | | | | | | | | | | | After Coin commit 60a6f795f5923c7c206b3fec4ebad991ce30d633 it is possible to include other intermediate configuration files. Create a new cmake_platforms.yaml file which will contain the default list of platform configurations to be tested in all cmake-enabled repos and qt5.git. Task-number: QTBUG-85044 Change-Id: I10e4dff8793a1ffb5776e00dac80f43394d18578 Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Align the CMake Packaging configurations with the qmake onesAlexandru Croitor2020-06-1621-64/+64
| | | | | | | | | | | | | | | | | | | For releasing purposes, we should align the configure arguments (actually CMake arguments) of the Packaging configurations with the ones we used for Qt 5.15.x releases. In particular for linux builds this means disabling the use of a few system libraries (a new one that needs to be disabled is double-conversion, it was not provisioned for Qt 5.15.x builds, but was installed for dev builds). Apply the changes across all repos, to be consistent and build the same for qt5.git and per-repo builds. Task-number: QTBUG-85047 Change-Id: I784abc6367bcda574691758942f89257e891647e Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2020-06-1520-0/+0
| | | | | Change-Id: I7b7b1bff3b511d684d682604be7b80e0909fd54b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add Qt3D back to addon list and update submoduleMike Krus2020-06-132-2/+2
| | | | | | | Getting ready for Qt 6 inclusion. Change-Id: I5e823ba5c9c0e42cb9afc3ce32d68fa44322f21a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add Qt3D Coin config fileMike Krus2020-06-131-0/+43
| | | | | Change-Id: I65f7fc2bd972484e82e0479311a41b364ace908c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix a lot of failing tests on MinGW 32bit due to debug symbolsAlexandru Croitor2020-06-1221-21/+21
| | | | | | | | | | | | | | | | | | | | | When building a RelWithDebInfo configuration, the debug symbols for the libraries are embedded into the .dlls. This causes the file size to be really big (around 400MB for libQt6Gui.dll). On a 32-bit system, the Windows loader failed to map such big libraries into memory, and thus certain tests failed with exit code 0xc0000017 which means STATUS_NO_MEMORY. The solution is to enable the separate debug info feature, to split the debug files into separate files, just making they dlls nice and small. This should fix quite a few of the failing MinGW 32-bit tests for qtdeclarative, qtquickcontrols2, etc. Task-number: QTBUG-84886 Change-Id: I10ae0acca5d7d5523d3ae2f0c49587ace239f301 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMake: Replace all Windows configurations with Ninja Multi-ConfigAlexandru Croitor2020-06-1219-19/+19
| | | | | | | | | | | | All the qmake MSVC Windows configurations are debug_and_release ones, so the equivalent CMake configurations should be the same for all repositories. Task-number: QTBUG-80900 Task-number: QTBUG-84883 Change-Id: I083d7a355558666a5f66efdffb592f5e93705547 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMake: Enable CMake builds for qtandroidextrasAlexandru Croitor2020-06-121-0/+43
| | | | | | | | | Everyone forgot to enable it after finishing the port. We should enable it, so it's tested for per-repo integrations as well. Task-number: QTBUG-78171 Change-Id: I8e024809b4ece5d0775817e072968b7162d7a38c Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Fix qtcoap configuration to use simulator_and_device iOS buildsAlexandru Croitor2020-06-121-1/+1
| | | | | | | | | | Just to be consistent with the rest of the files. Amends 803eb987adcf7448507b65effae9d59a490b53ae Task-number: QTBUG-80899 Change-Id: I26212c5367da7b8bf14e4a7d46b96ffb82bf9aab Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Enable qt5.git CMake top-level / super buildsAlexandru Croitor2020-06-122-0/+68
| | | | | | | | | | | | | | | | | | Add simple instructions to only configure and not build top-level builds, similar to what the qmake configurations do. The CMake configurations need to be copy-pasted again into qt5.yaml. We can't use default.yaml because that would enable CMake configurations for repositories that are not ported to CMake, and thus break the integrations. Update qtqa sha1 to a dev branch one which contains the module_config.yaml instructions to build qtqa with CMake. Task-number: QTBUG-84874 Task-number: QTBUG-84918 Change-Id: I8c64f5e0acc96e14a4952abb6c77fe5c8e27a0ec Reviewed-by: Liang Qi <liang.qi@qt.io>
* CMake: Enable iOS simulator_and_device buildsAlexandru Croitor2020-06-1217-17/+17
| | | | | | | | | | Coin now has CMake 3.17, so iOS multi-arch builds should successfully build. Switch the iOS CMake configurations to simulator_and_device ones. Task-number: QTBUG-80899 Change-Id: I9c8bde9f1a3c483ea296f3d9d06f089cbfdf2416 Reviewed-by: Liang Qi <liang.qi@qt.io>
* CMake: Enable CMake builds for qtcoapAlexandru Croitor2020-06-121-0/+43
| | | | | Change-Id: I89bc9162203069a61367763b0b9a482a96da87e0 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2020-06-1219-0/+0
| | | | | Change-Id: I8417277ae8f5ac6c269a98feace48d30fa688e23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Temporarily remove two broken platforms in qt5.yamlLiang Qi2020-06-121-14/+0
| | | | | | | | | We can re-add them later when issue got fixed. Task-number: QTBUG-84924 Task-number: QTBUG-84925 Change-Id: I2545e5fe03fd44a6016305723b57db8c0d6e9470 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt/qt5Qt Submodule Update Bot2020-06-1220-0/+0
| | | | | Change-Id: I0a12271af90aea12288614abcb0bd912d5c3384e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Revert "CMake: Enable CMake builds for qtqa""Alexandru Croitor2020-06-112-1/+8
| | | | | | | | | | | There's a new dev branch for qtqa, so we can re-enable CMake builds of qtqa using that branch, without breaking builds of other branches. This reverts commit 33e8275ee5bda554ab18dd349219262299bf1e9a. Task-number: QTBUG-84233 Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Provisioning: Change mounting folder for Squish installationHeikki Halmet2020-06-101-4/+3
| | | | | | | | | | | | | | Sometimes some process is locking the mounted folder (/tmp) so that it can't be unmounted untill the process has been ended. Let's create squish folder under tmp and use that for mounting instead Task-number: QTQAINFRA-3709 Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c671c2352e1db453da17d346316acfa627617786) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Provisioning: Install Node.jsHeikki Halmet2020-06-097-1/+81
| | | | | | | | | | Node.js is needed by QtWebengine Pick-to: 5.15 Task-number: QTQAINFRA-3729 Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8 Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Provisioning: Fetch pre-installed squish from local cacheHeikki Halmet2020-06-092-208/+88
| | | | | | | | | | | | | | | Squish installation is flaky so the installation phase has been moved from provisioning to Jenkins. Jenkins job will install the squish to target VM and copy it to local cache. This change only fetch the installed squish packages from local cache and uncompress those to VMs. Task-number: QTQAINFRA-3510 Task-number: QTQAINFRA-3107 Change-Id: I862da3250120dc6a43d9c04d973a25a691ca66a1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b0286d6cd6c86cfc3c5dbd5a3879354996632831) Reviewed-by: Toni Saario <toni.saario@qt.io>
* Remove SLES configurationAllan Sandfeld Jensen2020-06-081-5/+0
| | | | | | | | Mostly duplicate anyway, and not currently possible to install node.js on. Change-Id: I23a81ddb45b0597f31b1402e362f83957b5be8ae Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Use signed opengl32 packageHeikki Halmet2020-06-051-7/+7
| | | | | | Task-number: QTBUG-80252 Change-Id: Ife9942796ed64c4e2894fb3342259c674cf5d7ed Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Set Boot2Qt arm builds to release and developer buildLiang Qi2020-06-043-44/+2
| | | | | | | Task-number: QTBUG-63152 Change-Id: Id6f2411d6339b7bd1ccb261cf5d9bebe1d0ada1c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Revert "CMake: Enable CMake builds for qtqa"Alexandru Croitor2020-06-041-7/+0
| | | | | | | | | | Revert the change because the qtqa instructions have been temporarily removed to unblock other branches. This reverts commit a10584e57c1be4149b3a067de86fa61c44b8a757. Change-Id: I76646026b099d3b039eec6cdaecfbbce6df43aa2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix compiler mentioned for host tool building in RHELTony Sarajärvi2020-06-041-1/+1
| | | | | | | | This is only a cosmetic fix. That value is not used anywhere anymore. Task-number: QTQAINFRA-3757 Change-Id: Iabba6202e7ddbb08e58901a591ba0171e8dd1fc9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* qt3d: add shadertools to "recommends" modulesJean-Michaël Celerier2020-06-031-1/+1
| | | | | | | This is needed for Qt3D's RHI support. Change-Id: I416ee986db06479775a4dd4251261ecaac805b73 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Enable CMake builds for qtqaAlexandru Croitor2020-06-021-0/+7
| | | | | | | | | | | | | | | | | | Only includes one MinGW configuration, to mirror what Coin does with the qmake builds of qtqa. Switching the Coin instructions to do license checking and binary compatibility testing using CMake will require a different change. Most likely this change will have to wait until all of qt5.git/dev is moved to use yaml instructions for building, rather than the hardcoded instructions provided by Coin. Besides, the binary compatibility test still depends on finding qmake to run its test, which might have to be changed in the future. Task-number: QTBUG-84233 Change-Id: I5ab7120e965f7729968697abf9e0db602c216cd9 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Enable CMake builds for qtquicktimelineAlexandru Croitor2020-06-021-0/+43
| | | | | | Task-number: QTBUG-82967 Change-Id: I94324d4ef7d9d393e06a04e2eb1bfb0f9caab971 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Combine two macOS targets that are nearly the sameTony Sarajärvi2020-05-291-7/+2
| | | | | | Change-Id: I1c094f02d1cee059272680941b355e4fb2bbdd31 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix CMake provisioning for Ubuntu 18.04 x86_64 QEMU armv7Joerg Bornemann2020-05-271-1/+1
| | | | | | | | This amends 68134db4. Change-Id: I2eed240464f1b29c119ca0119001997aefdecd41 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update provisioned CMake version to 3.17.2Alexandru Croitor2020-05-263-6/+6
| | | | | | | | | | | This should fix the ninja deps issue we had on Windows with the Ninja Multi-Config generator, where calling ninja a second time to rebuild the project failed. More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723 Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Add MinGW config to all cmake enabled repositoriesAlexandru Croitor2020-05-2515-0/+75
| | | | | | Task-number: QTBUG-75578 Change-Id: I4957efff9f3438c85f9e653130898d4b60a555ba Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Switch qtbase Windows config to use Ninja Multi-ConfigAlexandru Croitor2020-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | And configure with two configurations, RelWithDebInfo and Debug. This is equivalent to qmake's --debug-and-release --force-debug-info This should give us minimal coverage for debug-and-release builds, as well as avoid regressions with NMC aka multiple configurations. If the qtbase builds successfully, we can try to extend the rest of the repositories to also build with NMC on Windows. We can't add such a configuration to macOS for now, because it requires CMake 3.18, which is not released yet. Disable PCH because it seems to fail the build when used together with Ninja Multi-Config. Task-number: QTBUG-80900 Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove the qtquickcontrols2 dependency on qtgraphicaleffectsTasuku Suzuki2020-05-231-2/+2
| | | | | | | | | | The Material style uses its own shader effects, and recent patches did the same for the Imagine style. There were some auto tests that have been made to only run if qtgraphicaleffects is available. Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Provisioning: Change resolution for Windows 10 x86_64Heikki Halmet2020-05-221-0/+25
| | | | | | | | Currently we have wrong resolution (1024x768) for 64-bit Windows. Correct one is 1280x800 Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* CMake: Enable CMake builds for qttranslationsAlexandru Croitor2020-05-201-0/+38
| | | | | | Fixes: QTBUG-82969 Change-Id: I17e7df82f578338d6c1e3dbc41677d4302d9689b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update submodules on 'dev' in qt/qt5Liang Qi2020-05-2020-0/+0
| | | | | Change-Id: Idd8c485848379879aa3d870ddf9740eab2fb95d3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* CMake: Enable CMake builds for qtdocAlexandru Croitor2020-05-141-0/+38
| | | | | | Change-Id: Idca63aef8951a4a104b816e4aac710225d1279c2 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Explicitly enable -headersclean on some configsLars Knoll2020-05-131-3/+3
| | | | | | | | This is in preparation to turning this off by default in configure, as it increases build times significantly. Change-Id: I2d601595ce8c093765194f36ec5235f79dd4dd7d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Revert "Temporarily ignore qtnetworkauth"Alexandru Croitor2020-05-132-1/+1
| | | | | | | | | | | | The qtnetworkauth test was fixed, so we can re-enable the module. Bump the sha1 to the latest version of qtnetworkauth. This reverts commit a8d3591327c3f5d3c1e349e752b2c43f7037fca9. Task-number: QTBUG-84071 Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* CMake: Enable CMake builds for qtvirtualkeyboardAlexandru Croitor2020-05-121-0/+38
| | | | | | Task-number: QTBUG-78185 Change-Id: Ie8a120aa3425edf6ae18f4a43dcd3f6aa697cd9f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Switch to MinGW 8.1 configuration for the qtbase CMake buildAlexandru Croitor2020-05-121-2/+2
| | | | | Change-Id: I974d34a33370ece9f9e240ba6e5106cc50d8bf84 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Temporarily ignore qtnetworkauthLiang Qi2020-05-071-1/+1
| | | | | | Task-number: QTBUG-84071 Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: Set macOS locale to "en_US.UTF-8"Alexandru Croitor2020-05-073-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 419f42903154489e2dace8d1eba183036275448b commit in qtbase introduced a regression where the tst_fusion test in qtqtuickcontrols2 hits a deadlock while trying to print a warning about a non-UTF-8 locale. The warning is due to the fact that the agent executed in Coin's VM does not have an explicit locale set, and thus it defaults to "C". There is no explicit locale set in any .bashrc (or similar files), and neither in any launchd configuration (because the agent is executed at macOS startup via launchd). The deadlock is due to trying to acquire the same lock twice while trying to write output to stdout. The test only deadlocks on CMake configurations, and not qmake configurations, because Coin has a hardcoded instruction to set the locale to UTF-8 when running qmake tests. Until the deadlock situation is addressed in another change, the issue can be fixed by setting the macOS configuration locale to UTF-8 explicitly, by assigning the LANG environment variable into ~/.bashrc at provisioning time, like we do with other environment variables like PATH. Fixes: COIN-578 Change-Id: Ib6a5849a6868c1776dd425aeb8b5e7d6faa8cde0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* CMake: Switch host macOS configurations to framework release buildsAlexandru Croitor2020-05-0413-13/+13
| | | | | | | | Also include debug info. This is the equivalent of qmake's --release --framework --force-debug-info --separate-debug-info Change-Id: I2778b4998890146c82552f9c721a48174a764839 Reviewed-by: Simon Hausmann <hausmann@gmail.com>
* CMake: Enable a MinGW 7.3 CMake qtbase configurationAlexandru Croitor2020-05-041-0/+5
| | | | | | | | | | | | | | It should be a developer build, but due to some features that are not ported in src/gui/configure.cmake (directwrite) there are compilation errors due to unused arguments in static bool QWindowsFontDatabaseBase::init(QSharedPointer) in platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp So it's not a developer build for now. Task-number: QTBUG-75578 Change-Id: Ieb6daca45473ea42748a39f3e9e33a9db087a0e0 Reviewed-by: Simon Hausmann <hausmann@gmail.com>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-3097-331/+1677
|\ | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 19:24:05 +0000