Plan is to terminate .ci.local soon
Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit d4cb44ad71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 becb423e80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 b730181404)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.
Amends 7e2882d0a7
Augments d59825d250
Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6e7de2b76c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 06edc60e1d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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>
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>
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>
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>
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>
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>
This is required for the upcoming conan integrations.
Pick-to: 6.2
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
Update qemu toolchains to include needed dependencies for QtWebEngine.
Pick-to: 6.2
Change-Id: Ia5cf09b3f94fe75d16304e717a9da04cb120ea79
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25431.1 Update 3
Visual Studio 2019 + build tools version 16.11.5
Visual Studio 2022 + build tools version 17.0.0 preview 7.0
Visual Studio 2022 + build tools version 17.0.1
Task-number: QTQAINFRA-4512
Change-Id: Ieceff236a9c12f34dc772c89cb93ad99d38d7fe5
Reviewed-by: Toni Saario <toni.saario@qt.io>
The CI uses e.g. "sccache" which is rarely used outside CI systems.
Also openssl install directories in the build profiles are specific to
CI build agents. Also headersclean option should be CI specific.
Split the current profiles in two: the CI specific profile defines only
the CI related details and includes the matching profile for the end
users.
The profile which includes other profile(s) will override the Settings
or Options if redefined.
Pick-to: 6.2
Task-number: QTQAINFRA-4619
Change-Id: If69e8c0c283655475671fcb0ca739087cd9d2567
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Due to some patch the linking requires more memory than
currently available.
Task-number: QTQAINFRA-4669
Change-Id: I872c2c7421d9e40f5a3ff36caaa2e229ed105f5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Add Packaging feature so that builds are exported from coin.
Change-Id: I64d03b2b67bad36eb23cfe79b995c7bce17e5eee
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
We want to distribute the used build profiles as well. For this we
can put the profiles in a separate Conan package that can be
installed easily.
This is a "header only" recipe which merely packs the profiles inside
the Conan package which the consumers can install with "conan install"
command:
$conan install qtbuildprofiles/6.2.0@qt/everywhere --build=always
Result:
./windows-x86_64-mingw
./linux-x86_64-gcc
./macos-ios-universal-clang
./...
Pick-to: 6.2
Change-Id: I745a089b4e855c006e1a5f2f0995a73abbcebf2f
Reviewed-by: Toni Saario <toni.saario@qt.io>
Use latest platform and build tools with macOS 12
Pick-to: 6.2
Change-Id: If3021f8f727c1775ad14b16897c7e9db3ea08ad1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This will also upgrade Xcode to version 13.1
Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Let's use this temporary hack so that we can get support
for setting Emscripten environment for Webassembly through qtbase
This change will be removed when we start installing emsdk using
emsdk.git. That installation process will automatically set emsdk_env.bat
Change-Id: I6eb417b28c9ca0cd01a743dea2fa38540fd4dcc3
Reviewed-by: Toni Saario <toni.saario@qt.io>
This might cause issues with compiler
Task-number: QTQAINFRA-4648
Pick-to: 6.2
Change-Id: I5971adc7fdafee4566d5c9c4efe808d72d170da6
Reviewed-by: Toni Saario <toni.saario@qt.io>
Needed for universal build of the psql plugin.
Task-number: QTBUG-93204
Pick-to: 6.2 5.15
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The coin 'Sccache' feature will take care of it.
Pick-to: 6.2
Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
Task-number: QTQAINFRA-4508
Change-Id: Ia93e534b6911b6aaef2a0107b067c1ba5e6a6224
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Remove mutually exclusive options.
Set the 'build_type' correctly so that it reflects the used build
Options.
Pick-to: 6.2
Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
The platform doesn't support sccache, and the "feature" was
likely cargo culted from some other config, as it was a noop
at the time.
Pick-to: 6.2 5.15
Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit amends 6af22246cf.
qtlocation now depends on qtpositioning, but does not require
qtserialport anymore.
Pick-to: 6.2
Change-Id: I1bda34020f7bc3683cf5038f2e1226d5209dfcc4
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Let's script this so we can be sure which language settings are in use
Pick-to: 6.2
Pick-to: 5.15
Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW
Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Latest qdoc has fixes that enables us to enforce zero warnings on
all qtbase modules.
Change-Id: Ie47011fa524fb869fb1e8856fd8c377e14be7e69
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.
Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
The new qtpositionig repo is created to split QtLocation and
QtPositioning development.
This patch adds the new repo as a submodule to qt5.git
It also marks the qtlocation module as ignored and removes
it from dependencies, using qtpositioning instead.
Task-number: QTBUG-97188
Pick-to: 6.2
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Custom Squish 6.7.1 for Qt6.2, macOS package back in the original form
without separate Squish server for Qt6.2.
Pick to: 6.2
Change-Id: I1edb9625f1d2891047d24676019448e8dd0fbaeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Update Vulkand version to 1.2.182
Include fetching from official location if cache is not available and
checking the shasum
Task-number: QTQAINFRA-4532
Pick-to: 6.2
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Patch 33734ad9c1 introduced a platform
with invalid tier1 name.
Change-Id: I701d3b891c0c0d96dfbd0c86c2ac709b218a1106
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
When final release is available we can add more targets
Task-number: QTQAINFRA-4540
Change-Id: Ic45b3b22a1f9fc45fa3577fe9e33f815a260ae89
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Let's include these needed versions to versions.txt and set
Visual studio versions as a last items in the versions list.
Task-number: QTQAINFRA-4542
Change-Id: Ic4c4c9f092925b0e4dc05a1874fa2ee651b24b7d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Packaging targets needs to be parallel
with older Windows 10 version until packaging
site is ready to start using new windows 10
version.
Inlcudes:
* MSVC 2022 version 17.0.0 preview 3.1
* MSVC 2019 version 16.11.2
* MSVC 2019 build tools version 16.11.2
* MSVC 2015 version 14.0.25431.01 Update 3
Failing targets marked as insignificant
Task-number: QTQAINFRA-4517
Change-Id: If841509923c2534a5bf626078b97f2d3f63a07b6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This seems to cause a hang with autotests
Task-number: QTBUG-96562
Change-Id: I439130700da4007569f25878788c6c04c89ada1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Some option names supported by qtbase Conan build recipe conflict with
other Conan package recipes, e.g. ICU which also supports 'shared'
option but with different supported option values.
Scope all qtbase related options in profiles to qtbase only.
Change-Id: I4c8bc2b7f5ee7cb69f3b83ef209ddda809719d73
Reviewed-by: Toni Saario <toni.saario@qt.io>
This makes sure that needed ca-certificates are installed during
provisioning
Pick-to: 6.2
Change-Id: I39289f237a54ca0805b1d9116ee899aecf02e72f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Also make cmake find libraries only from toolchain
Pick-to: 6.2
Task-number: QTQAINFRA-4580
Change-Id: I5eabaa3b6915e16db6ce152591d3b88bc7483d29
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This basically reverts 15e37e994d, as we
now have support for multiple TLS backends.
Task-number: QTBUG-93205
Change-Id: I7466121c21c459bb7aee70f9f7c224cc079d16a5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
The testing steps are done with the 'qt' user, so modify the ownership
and permissions when extracting the binaries.
Also update the version of the package itself.
Task-number: QTBUG-83851
Change-Id: I6d5318572e34c99637421e527d1e07286e55bfab
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
The INTEGRITY toolchain file in the CI does not set
CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding the
host libharfbuzz, causing the build of applications that use QtGui (or
any module that depends on it) to break.
Task-number: QTQAINFRA-4502
Change-Id: I64bd53a3cb30529898e7dd97502cb25229073f15
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This substantially decreases the package sizes. It's also what we
currently do for Qt 5.15.x WebAssembly builds.
See also f44dfe9c34 which did not enable
debug information for iOS builds because there's no implementation for
separating the debug info from static libraries yes.
Pick-to: 6.2 6.2.0
Task-number: QTBUG-96793
Change-Id: I743946c9e1367e88c7dd6dafec57648d9dbf2e9c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The QNX toolchain file in the CI does not set
CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding the
host libdbus, causing the build of applications that use QtDBus (or any
module that depends on it) to break.
Fixes: QTBUG-96791
Task-number: QTQAINFRA-4502
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Also, change the install directory - attempting to install directly
to Qt's installdir won't work as it gets overwritten by modules'
binary packages.
Task-number: QTBUG-83851
Change-Id: I96cd95f99322d1278d066d22965e54cf3c7701b4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
We need to disable GDS feature to solve OpenSSL library linking issue
Fixes: QTBUG-93759
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 2fd650b973)
Create conan profile per packaging configuration. Profiles will
carry configuration information to the builds conan does.
Profiles allow users to replicate identical configurations
to the packaging configurations and reuse existing binaries.
Change-Id: I50a2a4edbedbf56774bd4ceaae268928f8ed00e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
No need to have multiple RHEL configurations for Qt Creator.
Remove 8.2 since that will be removed for Qt as well.
Make the "Features" consistent.
Follow-up of cca8ac0023
Change-Id: Ie64578a22262c45b5ed9c2679b3072c958218bcf
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Currently will only build tests/auto/cmake projects in qtbase.
More work is needed for the other repos.
Pick-to: 6.2
Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Graphical login requires DefaultLimitNOFILE=4096
to be set in user.conf.
Task-number: COIN-699
Pick-to: 6.2
Change-Id: Ia07e834ebcffa2ed24a7c211255a4c4c5a10ca10
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).
Ideally, build tools should be kept up to date as well anyway.
Pick-to: 6.2 5.15
Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Latest version is 12.5.1
Pick-to: 6.2
Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
That is used by our Jenkins setup for packaging.
To keep things simple, just include the cmake_platforms and
Qt Creator's config.
Pick-to: 6.2
Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.
Pick-to: 6.2
Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
So it also runs on 32bit Windows. Ninja upstream switched their
binary builds to 64bit with Ninja 1.7, so we need to provide our own.
Amends e8b0be7711
Pick-to: 6.2
Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Provision documentation generators for Ubuntu 20.04, and add 'TestDocs'
feature to the configuration already used for generating documentation.
This is to allow building docs during the testing cycle to block
integrations that introduce new documentation warnings, without the
need to add a dependency to qttools.
Pick-to: 6.2
Fixes: QTBUG-83851
Change-Id: I74d7daeb7abb49403e97af41b0521f903607ce55
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This reverts commit 5ecf01ade7.
Reason for revert: Wicked doesn't work well with our Windows 2012's DHCP
Change-Id: I062fbfb50a68af308db9cb810583ca85c2c3e627
Reviewed-by: Toni Saario <toni.saario@qt.io>
Red Hat 8.4 will be added as parallel with Red Hat 8.3 until packaging
site gives green light to remove the older Red Hat version.
Also targets which are not tested during Qt5 integration will be set
as Insignificant until proven to work
Task-number: QTQAINFRA-4516
Change-Id: I3d9543da315b3d93ee8d9e37389acaf7212b00f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
These are needed for Android tests
Task-number: COIN-727
Pick-to: 6.2
Change-Id: Id12a75da2b4485ba5d655ceb0b7c7d6426f2b4cd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
- Make the script idempotent
- Use local architecture instead of hard-coding x86_64
- Set deployment target to 10.14
- Improve logging by not building with --silent
- Don't install manual pages
- Allow custom install prefix (for testing)
Pick-to: 6.2
Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This repository has been merged into qt5compat.
Pick-to: 6.2
Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This repository is not available in Qt6.
Every repository that recommends qtquickcontrols should recommend
qtquickcontrols2 instead. However, this has been merged into
qtdeclarative, which means that the existent dependencies on
qtdeclarative are sufficient.
Pick-to: 6.2
Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
It's now a part of qtdeclarative.
Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
QtQuick3D, QtRemoteObjects, also enable Harfbuzz and Assimp
Change-Id: I26e0f60afad40e66f858f99e8e7c852ac5fd9fbb
Reviewed-by: Simo Fält <simo.falt@qt.io>
The check is done in qtbase instead.
Trying to do it in the top-level project is cumbersome due to needing
to know whether it will be a static or shared Qt build.
It's also cumbersome because the top-level build used to use qtbase's
minimum cmake version values and that can get awkward to handle with
submodule dependency updates.
Replace the check with a regular minimum required call.
The minimum version is 3.16 and the upper range value for NEW policy
assignments is 3.20, while 3.21.0 is still kind of fresh and has some
AUTOUIC issues.
As a drive-by, add a clarifying comment about QtAutoDetect.cmake.
Pick-to: 6.2
Task-number: QTBUG-95018
Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
To avoid error 'too many path components' when building Qt on Windows.
Pick-to: 6.2
Task-number: QTBUG-95286
Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
While there was no target os value, COIN thinks that it is a normal
desktop target. This causes the host and target artifacts being copied
to wrong location.
Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Script was pointing to incorrect version and the prebuilt version
was missing from cache. OpenSSL Android is now rebuilt and cached.
Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 675c9ad6c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
ICC hasn't been used in a while, so no point in installing it.
Change-Id: Iefbdee631d57c66e2156625daf333337f9163365
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Following qtandroidextras removal in the commit
912fdda4a4, coin's platform
config yaml file has to be removed.
Pick-to: 6.2
Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
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
Pick-to: 6.2
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>
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.
Task-number: QTBUG-84382
Change-Id: I2f9b5a576781b5d45e563dfda7830c17996685a5
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well
Pick-to: 6.2
Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Based on wasm maintainer these should work already
Pick-to: 6.2
Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
It has to be addon
Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a1ee8408ff)
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2
Pick-to: 6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Timeout increased so this should be ok to move back to Redhat 8.2
Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e216d829ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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.
Pick-to: 6.1 6.2
Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The config is marked as Packaging, but it didn't specify the list of
CMake configurations to build and defaulted only to Debug.
Pick-to: 6.2
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>
This will allow exporting the testlogs for release.
Pick-to: 6.1
Pick-to: 6.2
Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.
Pick-to: 6.2
Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
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>
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>
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>
Rhel 8.2 with Android emulator seems to be unstable
Change-Id: Ibd858b25959b397d68e3242df0bf49eda3ca9445
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Windows and macOS hosts were still using 28 while Linux uses 29.
Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
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 7374ef8e38
Change-Id: Ifb4e1c8de57c7729f2965c16388f1acd763a150f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
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>
This patch only affects to dev branch.
Separate patch will handle 6.1 and 6.0 branches
Task-number: QTQAINFRA-4427
Change-Id: Ibaf6422061e9cd66a3458922fae7a4533f80c40f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
According to plan Qt Webengine will be back in Qt 6.2 so let's add
it in official builds
Task-number: QTBUG-93195
Change-Id: If7e0406bb66033e110f16518a73a2579721cb0c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Add defaults for now. Later this should get customized
to avoid unnecessary targets.
Task-number: QTBUG-91760
Change-Id: I72d3f11e117abeecf6c8c5fefac16fe951d3a9da
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Include libusb to linux, macos and windows
Pick-to: 6.1
Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
According to plan Qt Webchannel will be back in Qt 6.2 so let's add
it in official builds
Task-number: QTBUG-93212
Change-Id: Iea137a18d8c635210ee56e2ebfa1f485b4a791a8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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>
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>
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>
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>
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>
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>
And at same time bump qtconnectivity sha1 in qt5.git
Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
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>
We want at least one config that ensures static host Qt builds
work in the CI, even if no tests are built.
Amends bead5e8720
Task-number: QTBUG-87580
Change-Id: I091e85ca40faef30ddad57e2a392d65197a47027
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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>
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>
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>
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 55874781a1)
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>
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>
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>
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>
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>
Linker for Qt Webengine builds needs to open multiple files.
Without this it will hit the limit
Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: COIN-699
Change-Id: I53b8c38a4f719714971ca6a4b65349716a873170
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This avoids the need to bump the qt5.git project version when
branching the next minor Qt version.
Pick-to: 6.1 6.0
Task-number: QTBUG-92861
Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This reverts commit 919aa17249.
Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore
Change-Id: If77278c030be961d2282ff5c049d5ec6b03a578b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.
Pick-to: 6.1 6.1.0
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
OpenSSL 1.1.1 can't be build against Android NDK 22. Current OpenSSL
prebuilt was made against NDK 21.
Pick-to: 6.1.0
Pick-to: 6.1
Task-number: QTBUG-92075
Change-Id: I0e8a3017a9482ef269d736a8702b29b6bec1c2b2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Otherwise running cmake with QT_BUILD_SUBMODULES set in the environment
would not persist for later cmake runs without the environment set,
resulting in trying to reconfigure with every single available module.
Change-Id: I85e57b16fdc8e51cae8fff083c7a7536b0ed16f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This patch adds a macOS target that is run on the ARM64 macs.
Task-number: QTQAINFRA-4012
Change-Id: I255a288551846ae3328f614b64668fdc5ede2391
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Older git version does not allow fetching specific revisions.
This makes it impossible to fetch the integrations revision of
the repository.
Pick-to: 6.1
Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 6.1.0
Pick-to: 5.12
Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
- Drop Ubuntu 18.04 from CI; we aren't supporting it as development host
in Qt6. And we aren't using its prebuild binaries anywhere
- Drop 'Packaging' feature from QNX builds; we aren't packaging those
- Drop 'Packaging' feature from openSUSE builds; we aren't packaging those
Pick-to: 6.1
Change-Id: Ic5c6e0e1c480946380cbcf4b01133caffe7a71e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
All components now pass QNX builds so they can be made significant.
Old QNX6.6 removed from provisioning.
Task-number: QTQAINFRA-4286
Pick-to: 6.1
Change-Id: Idb6abcc1d61030e1edba9467044fe59d17ee9d82
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
There appears to be issues with sccache on q++/qcc compiler that
lead tha false positive cache hit and build failures.
Task-number: QTQAINFRA-4391
Pick-to: 6.1
Change-Id: I84f38242e6de4094933300bd535686206c849960
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
QNX 6.6 and 7.0 are not needed since they don't support Qt6.
Change-Id: I56d71bbebf421d1a5d952815878217b0bfdc85b2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.
Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ba149a162b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Xcode 11.3.1 is the latest supported version for macOS 10.14
It seems that in macOS 10.14 xip-package can't be expanded
through mount. It need to be fetched first.
Pick-to: 6.0
Pick-to: 6.1
Change-Id: I8c53787a2edde6b50abc7ec099ecc10b7515df2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
The WASM CMake port of Qt reads .emscripten and parses its content to
locate the emscripten root. We must bring our generated .emscripten
closer to what emsdk generates to prevent the parser from choking.
Change-Id: I5d17fb7679627ab3a7145f539f5a911fd227a6ac
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
If a subdirectory has a CMakeLists.txt file, but no dependency.yaml file
qt_internal_add_module_dependencies will bail out early, with
out_module_dependencies being empty.
Pick-to: 6.1
Fixes: QTBUG-92257
Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The variable now has a QT prefix to make it less likely to
clash with other environment variables. For simplicity we
use the same variable name internally.
Change-Id: I4c8b1a43ae1facc2e33ae3cd21a8f6b43a437a9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Currently the qtbase configure system always chooses to use
SecureTransport on macOS configurations, even if a usable OpenSSL is
found.
As it is, there's no point to pass the OpenSSL location as a
configure argument because one might get confused to think that Qt
will be built with OpenSSL support (it won't).
There is work in progress to allow building Qt Network with support
for multiple ssl backends, but until that work is finished, remove the
configure argument to avoid confusion.
Change-Id: Ib91f0b85edc580145a78ab38aba7718e90a95240
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Still using unreleased custom snapshot packages from Froglogic.
macOS: use custom build Qt5.15 package with separate Squish server
adjusted for Qt6.
Pick-to: 6.1
Pick-to: 6.0
Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
There's no mention of additionalLibrary status.
Pick-to: 6.1 6.0
Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Libclang static is not needed by Qt Creator. Also x86 package is not
available in download.qt.io or in cache.
Qt Creator is the only one using Windows 10 x86 at the moment.
Pick-to: 6.1
Change-Id: I983db655c497105c3154ab64b170a8ed8739a59c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
With current approach we need to make two different linux installers.
One for SUSE and one for other linux targets we support. This is because
current CentOS version have newer GLIBC version than what we have in SUSE.
This means that installer made with CentOS won't work in SUSE versions
we support
Task-number: QTBUG-91873
Change-Id: If65d66093bf8dcb5fe46812e06d6b9194fdedac2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
The target has changed on the remote. This time it will be cached
on the ci-files01.
Change-Id: Ibff640f889aa55f322c11bcf6a4a4893fb41b234
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Qt does no longer support being built with qmake.
Change-Id: I01598605b491e3c477553c6cc60118a9639b6dd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Commit da25b7f149 removed the usage of
TopologicalSort.cmake. Remove that file and its associated attribution
data and license.
Change-Id: I2dd34764c4343ac9ae0ce6fdcff5adcc3b70d299
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Read the 'required' value from dependencies.yaml and store all required
dependencies of repository 'qtfoo' in a global property
QT_REQUIRED_DEPS_FOR_qtfoo.
Check this property in the top-level CMakeLists.txt and only print
informational messages instead of errors for optional dependencies.
Fixes: QTBUG-91144
Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This patch adds QtSerialBus to be updated by submodule udpate bot.
Change-Id: I9b51118d21ee4309315d36cab5bf9721b34067f7
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This patch adds QtLocation to be updated by submodule update bot.
Also removes unused dependencies.
Task-number: QTBUG-90864
Change-Id: Ia54234ad26907129932d76be11a3402cd8bddec9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This patch adds QtSerialPort to be updated by submodule udpate bot
Task-number: QTBUG-90864
Change-Id: Ic029157a7b6e88f8c8899f9f5b075943d2767810
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
We need to use gcc 8 instead of 9 so that the Qt installer
will work with CentOS 8.3 which have gcc 8 in the system.
If we use newer gcc version with the binaries there will be issues
with libstdc++.
Using gcc-toolset-9 in CentOS won't help either because it will link
libstdc++ against the one in system.
Pick-to: 6.1
Task-number: QTBUG-91352
Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This fixes the warning 'Useless use of a constant ("qt5") in void
context at ./init-repository line 649.'
Pick-to: 6.1 6.0 5.15
Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
We shouldn't change configuration parameters when whiching to use
Ubuntu 18.04 instead of CentOS 8.3
Pick-to: 6.1
Change-Id: Icfce35acec8baa4488089e555c311a063455c24b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
To have QtAndroidExtras and QtConnectivity updated by
submodule update bot, this patch marks both of them as
addon instead of ignore.
Change-Id: Ibf34848978ef1f39273f71c99c6b1f7e18bf2fe6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
All tests should pass now. The ones that may turn up are flaky,
and should be blacklisted.
Fixes: QTQAINFRA-4116
Change-Id: I1a57227d544bfb2db812b92ddf8616764e424c33
Reviewed-by: Simo Fält <simo.falt@qt.io>
We need to start using Ubuntu 18.04 with Qt6 binary package
targets. Ubuntu 18.04 includes older GLIBC version which
shouldn't cause any problems with linux distributions supported
by Qt6
Tests will be executed with Ubuntu 20.04.
Task-number: QTQAINFRA-4193
Change-Id: Icb189c509351ff080a2c6431299cc0be6ba8adc1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
In CentOS 8.3 seems to be bug with setting Wayland instead of x-session.
Task-number: QTQAINFRA-4246
Pick-to: 6.1
Change-Id: I1099ca7ef5425f7383ab8a2e9988efeb42a858e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Introducing additionalLibrary to .gitmodules
broke init-repository. Add the new state also
here.
Task-number: QTBUG-90669
Pick-to: 6.1
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
The default shell on macOS 10.15+ changed to zsh, so we need to ensure
the environment variables are picked up by that as well.
Change-Id: Ib8c8d8017c0d22fdbbf429936876824d386d4f4c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
qttools is needed to be able to build documentation
Pick-to: 6.1
Fixes: QTBUG-90996
Change-Id: I27f101dc4294f830b9915e1530d660cfe12aeabe
Reviewed-by: Toni Saario <toni.saario@qt.io>
Set status to additionalLibrary to ones already in .gitmodules as ignore status
Add missing ones with status = additionalLibrary
Task-number: QTBUG-90669
Pick-to: 6.1
Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2
Reviewed-by: Toni Saario <toni.saario@qt.io>
The tst_qlocale::macDefaultLocale() test was failing on macOS 11 because
the VM images had been set up with Finland as the region, resulting in
a different number separator than what the test expected.
Fixes: QTBUG-90696
Change-Id: Ia2f68adc1401f21721d1786c5279aa0918a311a8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
To get rid of the computer name notification multicat
advertisements needs to be disabled. This notification seems to
affect to autotest by causing misleading failures.
Task-number: QTBUG-89746
Pick-to: 6.0
Change-Id: I2365092ee05cc731b78e17c56eee7c4370a9f0a7
Reviewed-by: Toni Saario <toni.saario@qt.io>
These are snapshot packages from Froglogic, not available for macOS yet,
thus it will still use Qt5.15 based Squish. Only Linux and Win packages
are updated now.
Along with the Squish for Qt6 we need the Squish for Qt5 to be able to
run Creator tests (since Creator is still Qt5 based).
Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5
Pick-to: 6.0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
We need to build the target "docs", not "generate_docs". The latter only
creates html documentation.
Creating .qch files is done with qhelpgenerator, and qhelpgenerator
needs proper platform plugins and the sqlite plugin. To keep things
simple, we build all the platform plugins and SQL plugins.
Fixes: COIN-659
Change-Id: Ief8f71f27836e7667e3a96e0b2654bdd45647ed4
Reviewed-by: Toni Saario <toni.saario@qt.io>
This was missing from fea422c0a6
Task-number: QTQAINFRA-4174
Change-Id: Id829e4a1ccc23890ed53618c8a5c200b1dda8100
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Conan package manager is need for addtional libraries
Task-number: QTQAINFRA-4190
Change-Id: I5cb07a137505f15d536989c6d5127f607735a17e
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>
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
We now build with the latest Xcode available, and then run the tests
on all the supported deployment target (10.14, 10.15, 11).
At this point we have the following build/test coverage:
- Packaging build, all modules tested on:
- 10.14 (significant)
- 10.15 (insignificant)
- 11.x (insignificant)
- Developer build, qtbase/declarative tested on:
- 10.14 (significant)
- 10.15 (insignificant)
- 11.x (insignificant)
Change-Id: I309bbf5ace7b22b768203f579e29f7a9e2b589b9
Reviewed-by: Toni Saario <toni.saario@qt.io>
Only one target is added because current HW capasity is minor.
Task-number: QTQAINFRA-3967
Change-Id: Iae2ac0e02b38b45a219a78e046fb21338ff9cd97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Both static and dynamic libclang packages are missing from our local
cache. Dynamic and static packages need to be in different folders
because package names are identicals
Pick-to: 6.0
Pick-to: 5.15
Change-Id: I0d4c0c776f1c5f318417cae6c16d683b31a10710
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
ICC installation fails when checking digital signature
Task-number: QTQAINFRA-4174
Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d238c03742)
It's handled by the provisioning scripts that install Xcode and make
it the default via xcode-select --switch.
Change-Id: I788a3672f554112517619f55d5cc810351c56bff
Reviewed-by: Simo Fält <simo.falt@qt.io>
It's handled automatically by the build system, and set to the
lowest macOS version Qt supports at any point in time.
Change-Id: I7dc7b9f7fe5961ad4d4383590077d7990a84f850
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Update yocto toolchains and use qemu from the toolchain.
Using GCC 10.2.0 and QEMU 5.1.0
Task-number: QTQAINFRA-3836
Task-number: QTQAINFRA-3741
Task-number: QTBUG-84167
Change-Id: I5bfa2c67100299c1c910cae2453b93dbc37cbb55
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Android openssl configuration is flaky. Some cases it can't find perl.
Let's use prebuilt package from local cache. If not available then
download sources and configure it.
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3993
Change-Id: I4b15cba763d88d85dfe7908fa22c2ce5f461f5cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Needed for coin_cloner to be able to create virtual machines for
macOS10.15 targets in RTA tests.
Pick-to: 6.0
Change-Id: I499a54a249a8295e014d7fa08bc32284dc8c73a3
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
It was already using Markdown-alike syntax. Let's just go the full length,
and make it a proper Markdown file.
Change-Id: I6b0dcbc9118e9b31aebef30db85a244a100f6eff
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This reverts commit b8ae74d78a.
Reason for revert: Emulator startup issue is fixed now with
86a655387c26cd25dde69cebd18b5ff9379fbe3e.
Pick-to: 6.0
Change-Id: Id5d8f4db7bfcf194076385c6271bb324c126e268
Reviewed-by: Toni Saario <toni.saario@qt.io>
It's dead, Jim.
This revives 1117d4da2c which was reverted
in 66ed87fc67 to make a resurrection
easier. However, there was no revival attempt for many years now, and
it's unlikely that this is going to change.
Pick-to: 6.0 5.15
Task-number: QTBUG-89664
Change-Id: I55134f407ec870ab25824e352ac77bff28a5f0f0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Xcode 12.3 is currently supported in macOS 10.15.4 and 11.1
Task-number: QTQAINFRA-3962
Change-Id: Id919e63cd792e4c35b4bb625a574009fd044f440
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Since Qt 5 Compat now also includes Qt Graphical Effects,
it depends on this repository.
Change-Id: I5f55958d774e17434946470fd7dc65bb305805c3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Do not link against the GLVND OpenGL libs (libOpenGL.so.0), because
those might not be available on target systems.
In order to do that, we set OpenGL_GL_PREFERENCE to LEGACY.
Pick-to: 6.0
Fixes: QTBUG-89754
Change-Id: I28e8c62b137f17cf6692b84f438a8ae60ebe0e91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
With CMake 3.19.2 provisioned, iOS will be able to compile with PCH.
Pick-to: 6.0
Change-Id: Ic9c9eef98d229a7cb8d87fa1e4555cdbeac1f7cf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This makes windows binaries available from remote url and brings
some fixes to the sccache itself.
Change-Id: Ie108cbef783dbd4d7665964cdc00f0b05b062763
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
As Qt uses only static archives of libclang, we have to install
dynamic version as an additional package. Libclang is required
for example QtForPython.
Pick-to: 5.15
Pick-to: 6.0
Change-Id: Ic9d70398113defe3561f261aee369b423c18686a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
The helper makes sure that all questions for confirmation are answered
with yes, which unblocks a second provisioning run.
Change-Id: I33b58a98ceed3f736eabde90e15e959a7139923e
Reviewed-by: Toni Saario <toni.saario@qt.io>
This reverts commit 9a8fb868ec
partially.
See also d494d76c26.
Task-number: QTQAINFRA-2577
Task-number: QTQAINFRA-3407
Change-Id: I6a01bea15002efe140c022a79e7f3f2f5a47c202
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Was unpacked into a subdirectory with the same name as the archive
Pick-to: 5.15 6.0
Fixes: QTQAINFRA-4055
Change-Id: Ic11d2d926a1d2250b963010729d70bd00b992f89
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Pre-built package was missing from cache and source package
was named as pre-built package
Pick-to: 6.0
Change-Id: I6d14b198ab7e3795e5f70986c9a50662225ac666
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Qt 6.0 is now built with CMake successfully in the CI and we have
most of the coverage we had with qmake CI configurations. Apart
from platforms and modules we deemed not part of 6.0 release.
We didn't have enough time to disable qmake configurations for
6.0.0, but we should be able do it now for 6.1.
We can also consider removing qmake configurations for 6.0.x
sometime later.
Remove all CI configurations that use qmake to build Qt.
Keep the default.yaml license check UseLegacyInstructions
configuration, because license checking hasn't been ported to use new
Coin instructions.
One consequence of this is that developers that are working on
platforms and modules not yet ported to CMake (like WebAssembly or
qtwebengine), will no longer have coverage in CI until they are ported
to CMake.
If there are repo owners that wish to retain CI coverage for building
their repo with qmake (until a CMake port is done), they can do so by
creating a product_dependencies.yaml file in the root of their repo
and specifying an older qt5.git sha1 (so before this change is merged)
which still contains qmake CI configurations.
Task-number: QTBUG-88741
Task-number: QTBUG-86053
Change-Id: I985cf0597d6d3e1717fdff8b654397a5f9236a6e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Different Windows versions seems to use different name
for network adapter. Let's move this from common scripts
folder to Windows 10 platform folder
Pick-to: 6.0
Change-Id: I6a4a15ead41aef2e79b1b7782f1c5ffa6e46cae1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
The code is only used for building Qt, and not shipped by customers.
Pick-to: 6.0
Change-Id: I0e255fe674b1703160608ab6b208918ea511baa4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Having several toplevel worktrees for the same branch is problematic, but
but we do want to be able to have one toplevel worktree synchronized to
e.g. one submodule's dev and another with all submodules at the respective
dev heads.
So fall back to detached checkout if regular checkout fails, and generate
a warning.
Change-Id: I13981ab931cbbd8b56187979708bfe63f7373718
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Since we later check the worktree out to the revision specified
in the dependency file, add it as detached to avoid conflicts
with already existing worktrees for the default branch.
As a drive-bye, fix a typo in a comment.
Pick-to: 6.0
Change-Id: I81c30c1fa3cfc9831fe7884a103746b43478dd8e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
When fetching dependencies, the submodule directory might not exist
or might be empty. If so, try to initialize the submodule before trying
to add the worktree.
Pick-to: 6.0
Change-Id: Ie4d6ec483ac9ea3f9207d5ab4cea34d6e0fb2921
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Modern git usage for submodules is that the git object storage is absorbed
into the supermodule (see git submodule absorbgitdirs).
Handle both cases when trying to locate the gitdir for the target module.
Pick-to: 6.0
Change-Id: Icddbae3a4d9a8823551106f089dbbff2c935ff35
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The qtbase Android test job often times hangs, causing other
integrations to fail. Until the issue is fixed, mark the config as
InsignificantTests.
Pick-to: 6.0
Change-Id: I4921d5a830bf49cb144a6e93bd4e3a6ee34f216f
Reviewed-by: Toni Saario <toni.saario@qt.io>
While default.txt contains configs with UseLegacyInstructions it can't
be used by pyside-setup, while it falls back to COIN's legacy
module class.
Change-Id: I5d2856344b817f6085ba66643f47803ccee29b06
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 32d8d76755)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The upload for the documentation was missing.
Change-Id: I9f1df81ecee3bbf6dd1128d24ae4fd2717bb3dcb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0848b04307)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
01-enable-modules.sh was run before packagekit was disabled
causing lock situations where packagekit is still holding on to
System Management.
Task-number: QTQAINFRA-3959
Change-Id: Id9995bbe140055af323093b58225d85b2e116bab
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Sometimes items are locked by some windows process so that they can't be
removed. This will fail provisioning instantly.
Let's give the removing process more time by retrying if it will fail
on first attempt
Change-Id: Ic5c16c0d920ed0625d0c6830323d0bc6ba2cd608
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
RedHat 7.4 isn't supported in 6.0 or in 5.15 branches
Pick-to: 5.15
Change-Id: Ia3ad450a944884035ec3a822e09f73c6970450d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Since doing either for qtbase and qtdeclarative can take a long time,
and since it's a relevant change to the local file system, log what's
going on.
Swallow output from most git commands unless cmake runs in VERBOSE
mode.
Pick-to: 6.0
Change-Id: I984915689247d6372240744b5bc9183660046084
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
For missing dependencies, create worktrees from existing clones if
found, otherwise clone from the same remote.
Change-Id: Ie624e6c1b3f621dce43ee8cc7f06ce469851285b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Make a few modifications to the dependency evaluation to include the
revision of each dependency, and a method that checks each dependency
out to the revision necessary to create a consistent set for the
requested module.
If the requested module is ".", check all modules out to the given
revision.
Can be called (ideally from a git-sync-to alias script):
cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" \
-P cmake/QtSynchronizeRepo.cmake
Change-Id: I007e9f9023bae949907b64e264ae7869dff1da2e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
By moving the static build to SLES, we can run autotests on openSUSE.
It also makes sense to move the developer build at the same time.
Change-Id: I5e0c4b0caf2bbd5a0d419555b1e270673adfc890
Reviewed-by: Liang Qi <liang.qi@qt.io>
Move all modules dependency check before actual configuration of
any module.
Change-Id: I40838ab59de1be1cd8ca3a006e195455f2692982
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
CentOS 8.1 is now in CI without Insignificant flags so
Rhel 7.6 can be removed.
Task-number: QTQAINFRA-2760
Change-Id: Id797a6ea5bf9c4d64929b4d6e183d0c7146309ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Add correct version for Visual Studio 2015 and also
update the script name to point to MSVC 2015
Change-Id: Ice9b8359fbdcd885227eb94f6ef8cbbb5a02f099
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Put dependencies of all modules to top-level variables and
check for unmet dependencies before module configuring.
Fixes: QTBUG-88214
Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
We want to be able to build qdoc and lupdate on MSVC with
Ninja Multi-Config.
Task-number: QTBUG-85411
Task-number: QTBUG-88139
Task-number: QTBUG-87315
Change-Id: I53b705535981b67c817f4d49d435e8f2a0553f74
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Don't rely on .gitmodules, instead parse the dependencies.yaml file from
every subdirectory with a CMakeLists.txt, and sort all projects based
on that data. Projects with no dependencies are added last.
This allows us to get rid of the duplication of dependency information
in .gitmodules, and makes each module the authoritative source of its
own dependencies.
Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Latest additions of CentOS cause troubles due to
- Updated SSL to set up tls servers
- Updated Python version, which removed API calls
For the latter, we only need to update the broker. TLS test servers
are not used in our setup. However, qtmqtt.git requires on further
update to load a different configuration.
Task-number: QTBUG-88189
Change-Id: I2d6e559a21dff41deca94aeec8c5db6fdf72a0ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
With value 100 the sccache would provision between 10 and 20, which
might lead to unexpected behavior.
Change-Id: I3143d2102ff03c744476910dffdb924ca3164d26
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
"_ARCH_" was dynamically replaced by either 32 or 64 in
qttools/configure.pri. Anyhow, this is not supported by the
CMake build, and not needed, since we only build with 64
toolchains on Windows.
the qmake builds can still automatically select the "right"
toolchain by either loading LLVM_INSTALL_DIR_msvc,
LLVM_INSTALL_DIR_mingw. But for CMake builds
we now explicitly set LLVM_INSTALL_DIR in each configuration.
Fixes: QTBUG-87215
Change-Id: Iaa7e6eab676c03b34ea723d9f71888ca9ee7bb1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Replicate the instructions that Coin does for qmake configurations.
Build all of qttools and its dependencies and then build the top-level
docs.
Task-number: QTBUG-87012
Change-Id: Iac70172cf13d8943e60c26a1f2ee3ddf5bae6667
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This is the top-level counterpart change that uses the infra
introduced in qtbase.
Task-number: QTBUG-88086
Change-Id: I2524cd88da43cffb2b3742caedd1cd2f3130dff5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Builds are passing, but tests still failing
Task-number: QTQAINFRA-3949
Change-Id: Ieca2512e06ca09cabf042ee3c966dae65c9e5e86
Reviewed-by: Simo Fält <simo.falt@qt.io>
This change will upgrade the msys2 package
Change also updates the script to use cached
prebuilt package if available.
This will also remove unneeded x86 installation
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Need to include a fix in qtquick3d for cmake developer build on
Ubuntu 20.04.
Change-Id: I18b87aef320fc3b36d1383ff58efff51a605bc71
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Builds are passing now with Ubuntu 20.04, but tests are still failing.
Let's set Insignificant flag to affect only to test phase.
Change-Id: Ib9b4d652c9518d59d6a36c58b3a11f40ce777a74
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Builds are passing now and almost all autotests. Let's set insignificant
flag to affect only test phase for now.
Task-number: QTQAINFRA-3065
Change-Id: Icd233ef58bf92ec9ebfb6b56e163c16aad045bbd
Reviewed-by: Toni Saario <toni.saario@qt.io>
Ipv6 link local becomes tentative and dadfailed if two systems
has the same secret_key. New unique secret key will be generated
automatically during boot up
Task-number: QTBUG-84254
Change-Id: Ic229c4e0ffd5bb708894131238a70c04eb1b5b98
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This doubles the amount of processor power given to the VMs. This
mirrors what Coin does when it detects a -debug-and-release flag in
the configure flags when doing a qmake Qt build.
Change-Id: I33a5c6a50a4ac279d097664d145439c856f132ec
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
...to prepare switching the default from qmake to CMake.
Task-number: QTBUG-87049
Change-Id: I0f17e65cead99d2b7bf3191b1bfc96cee7d089e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The power-shell scripts don't need to be executable (MS-Win doesn't
care and we don't run them on Unix).
The shbang line in a shell script only works if it's at the start of
the file, not after a blank line.
Change-Id: I12a927f414621187f867864617276528a59652e5
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Needed by webengine which broke from the switch from RHEL to CentOS.
Change-Id: I1f0b855b73716e0e2133be895e55000d72658962
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Also disable warnings_are_errors. That's the way it is in the qmake CI
config. It was probably an oversight.
Fixes: QTBUG-85438
Change-Id: Id6e6a778dca1bfc5c13289e3f55048ce515e923f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3974
Change-Id: I5fd918882c51c01985cd4c1b9f9ed4dec62e07dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Pass -DFEATURE_msvc_obj_debug_info=ON to enable the /Z7 flag
compilation flag, which will embed debug info into the .obj files,
thus enabling usage of sccache for MSVC CI configs.
Task-number: QTQAINFRA-3934
Change-Id: I151eece0e35ebee8df0c58641727219ee40a7409
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Insignificant flag is added for two targets. RedHat 7.6
will be kept as parallel until insignificant flag can be
removed from CentOS
Task-number: QTQAINFRA-2760
Task-number: QTQAINFRA-3065
Change-Id: If124600309644e6a066805cd728bf12862006a21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
To ensure that examples can be built with an xcode project
generated by qmake, we have to ship both debug and release
libraries.
So use Ninja Muli-Config to build both configs.
Note we build Release and not RelWithDebInfo on purpose, so we
don't inflate the package size too much due to the embedded debug
information.
We can probably switch to RelWithDebInfo once we implement the
separate_debug_info feature for static builds.
Fixes: QTBUG-87638
Change-Id: I3e26cd0e47fc96fbdee8b3b0177f78fa266b8cc4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
While building Clang 11 for Qt the tests failed due to missing Perl
Digest-MD5 package.
Pick-to: 5.15
Change-Id: Iba4156db65ec53bf465ca5b132e6983f1176bc41
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Target are already ported to cmake and qmake
target is failing with CentOS which will replace
Redhat
Change-Id: I792ae826c96012a10050ca07a071e01780f54f0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
qt3d, qtimageformats and qtnetworkaut will be delivered via package
manager so those shouldn't be in qt5.git integrations from Qt 6.0 ->
Task-number: QTBUG-87255
Change-Id: I2ddaf561123153b78b4bd972c22a90ba1309a91d
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
This is needed to ensure that the auto-detection runs before any
toolchain file is loaded, like in a stand-alone qtbase build.
This fixes the issue that we had to specify ANDROID_STL=c++_shared in a
top-level build, even though it's properly defaulted in
QtAutoDetect.cmake.
Task-number: QTBUG-87309
Change-Id: I8ced2213ca2e5a877bfd210e59da4ef4d6c8ac74
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The subdirectories, the top-level CMakeLists.txt adds, contain
find_package(Qt6 COMPONENTS ...) calls. When cross-compiling to Android,
the toolchain file sets CMAKE_FIND_ROOT_PATH and
CMAKE_FIND_ROOT_PATH_MODE to ONLY. That means, the packages that are
created in qtbase can never be found by other Qt repositories, e.g.
qtdeclarative.
Append the qtbase build dir to CMAKE_FIND_ROOT_PATH to find the Qt
packages of the build dir when cross-compiling. Because of some CMake
idiosyncracy, we need to append "${QtBase_BINARY_DIR}/lib/cmake" to
CMAKE_PREFIX_PATH and not just "${QtBase_BINARY_DIR}". See
qtbase/ec90f9013b4c6b63d7e03a964f66f97329be7885 for details.
Task-number: QTBUG-85080
Change-Id: I799f851316538c310d73f5ab59c809229e16e8a8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This is a left-over from before the bin, lib, ... directories were moved
to the qtbase build directory.
Change-Id: I24bfa36289648288b2b44cc809e0c390cd2c043b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
While bulding on CentOS with Red Hat libclang packages we end up with
linker errors due to differences in C++ ABI used.
Ubuntu 18.04 package works fine with CentOS 8.1.
Task-number: QTBUG-86968
Change-Id: Idf0435a06046fb791b8ca1086e6465521ba6006a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
To get at least some build coverage in CI, otherwise it fails to build
in qtbase.
Task-number: QTBUG-83968
Change-Id: Ifc67d3e98c0a00ad94211f8d73efa30a35eb0e14
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
qemu can't emulate the feature properly, and that causes many tests
that use QProcess to fail. Use the newly introduced feature in qtbase
to disable the feature for qemu configurations.
Task-number: QTBUG-86285
Task-number: QTBUG-86187
Task-number: QTBUG-86198
Change-Id: Iecd5c64f6f2e98e5c5ab893b50a1fee2bc10108f
Reviewed-by: Toni Saario <toni.saario@qt.io>
Visual Studio 2019 can be updated with version specific online installer
Change-Id: I1ec1f96e68e8e3440d85240d09eec59a421708db
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Currently GCC versions which comes with the system are missing from
versions.txt. This change will add those
Task-number: QTQAINFRA-3933
Change-Id: I1934e6257acf92d72dcb382884aad60503b7b32f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
The license should be GPLv3-EXCEPT, like for the same file in qtbase.
Pick-to: 5.15
Change-Id: I59c63c0a693394dc9f8de4706c2e113fe2ea4130
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
The sccache can also be used to speed up building tests. Test related
Environment variables are read by instructions and appended to tests
CMake call by: 7545511e37d69a119bbec861226700832799331f
Change-Id: I9b350f73b89e15d6b372417335acbf2312b67691
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The open-vm-tools causes segfault during boot and dumping the core
freezes agent execution for the time being causing failures on
commands with short timeout.
Change-Id: Iff8807d1332b7a6d046b5a5d7d606552ebe48807
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This causes VM slowness during the boot and the agent initialization.
Change-Id: I08ab4d56131f12af85847802230a5446a5e6fa29
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Android targets, QEMU and the Ubuntu are capable of caching artifacts.
Change-Id: I417b7e9b7bd85fb21cce6dfbb2ac8985faba58eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This version should fix the iOS PCH builds and Ninja Multi-Config,
as well as the issues with AUTOMOC and Ninja.
Temporarily explicitly disable the pkg_config feature on Windows
hosts, because otherwise the configuration will break. The
FindPkgConfig module in 3.18 has some additional behavior for checking
if the found pkg-config works, and that's not handled by our
qt_build_internals_disable_pkg_config_if_needed function in qtbase.
Fixes: QTBUG-86862
Change-Id: I80514d3d7896ae09ab252aed10e86725fae0cc9c
Reviewed-by: Toni Saario <toni.saario@qt.io>
This will install STM32CubeProgrammer to Windows 10 needed by
MCU RTA
Task-number: UL-3091
Change-Id: I97f7df33af9bf4c56849c1cf3c93b3a413ba6f44
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Based on default with a few unsupported platforms removed
Change-Id: I8edfa83f3cc09172c041e8dd6adaf96666d0238d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
MCUXpresso IDE provides the tools for flashing and onboard debugging
Task-number: UL-3091
Change-Id: I05224af4ae7528f219f1b682ecd14bd0e331e3bf
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Cloned VM generate same IPv6 link local addresses as the original host.
The approach of generating link-local IPv6 address can be changed
per-interface from stable-secret to based on MAC. This change will
remove IPV6_ADDR_GEN_MODE line which should be enough to change
default stable-secret to based on MAC.
Task-number: QTBUG-84254
Change-Id: I9455a8b11902d35517f43228b4ef63a884ca7522
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Adds the missing Windows host Android target configurations.
Each android architecture we support is re-added as a separate
configuration, because CMake builds currently don't support multi-abi
builds as tracked in QTBUG-80943.
Task-number: QTBUG-86053
Task-number: QTBUG-85911
Change-Id: I421c6fc726a4813dbab5fcd67961ae4124eccb13
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This partially reverts 37cb787dc1
because it reintroduces the macOS host Android configs which were
removed due to qtbase std::pair shenanigans.
Each android architecture we support is re-added as a separate
configuration, because CMake builds currently don't support multi-abi
builds as tracked in QTBUG-80943.
Task-number: QTBUG-84924
Task-number: QTBUG-86053
Change-Id: Iac48ab41a1eb9cf1e4219f62683355d1bb9a9891
Reviewed-by: Liang Qi <liang.qi@qt.io>
It wasn't added before, because it didn't build due to an issue
in qtbase regarding qdrawhelper.cpp and avx2, which is now fixed
in ff1a44be33f4bc05d502a2ca49171e0408992f61 in qtbase.
Task-number: QTBUG-86053
Change-Id: I425e6a81840276a850bd95db45d5ecdfae5487a8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update libjpeg-turbo to 2.0.5
* Replace MinGW 7 packages with MinGW 8
* Remove zlib packages as Qt is consistently built with -qt-zlib now
Task-bumber: QTQAINFRA-3916
Change-Id: Ib3355265dc35326d30eacb60d0e3c97f06e6f9be
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Btrfs use lot's of CPU while running
Task-number: QTQAINFRA-3919
Change-Id: I08b89b57c92d90f752dde76375711e61ed173c2c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
fstrim scans the filesystem and sends 'UNMAP' commands for each
unused block it finds. Let's disable it so it won't cause unexpected
situations.
Task-number: QTQAINFRA-3919
Change-Id: I20c97441fd47728a3063ae50f87fe6347186bdbd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Win10 x86 archive was missing msvc142 x86 package.
Pick-to: 5.15
Change-Id: I532c3a1129d75968c22b721390ff474548e642bf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
QtWayland looks for WaylandScanner. If QtBase is installed our CMake
find files will be installed and everything will work correctly.
If QtBase is not installed yet or out of date, we need to add our source
cmake files to the search path. We currently add one of the 3rd party
directories, but not the subdirectories.
Change-Id: I53ce26b5b21b7e5e74752c730bca90295147f851
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Apparently qmake doesn't actually use the env var, but this failed
the WIP CMake Android configurations.
Amends e3600116b3
Change-Id: I30866af0eb63efefe72b709182f8cb5ba3250b12
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
In Qt 5 times, qmake was able to build libraries for multiple Android
ABIs in one build tree.
In Qt 6.0 + CMake we can't do that yet, which is tracked in
QTBUG-80943.
We still need to build and ship libraries for all the ABIs, so use the
old style approach of one configuration per ABI.
Add some of the missing ABIs for the Linux host case:
arm64-v8a, armeabi-v7a, x86.
The x86_64 ABI will be added in a separate change, due to a bug in
qtbase regarding Gui's qdrawhelper.cpp and avx2.
Because it's a lot of copy pasting, move the configs into a separate
yaml file so it's easier to search and replace in the future.
Task-number: QTBUG-86053
Change-Id: If8419ce20ac033b644c49c0bac70196cd30fd679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Now that we reuse host artifacts, there's no point in specifying host
configure arguments on target configurations, they aren't used.
Remove them to avoid confusion.
Change-Id: I176fe421bc36772cb29929c082ea76946210f98b
Reviewed-by: Toni Saario <toni.saario@qt.io>
Python installation is flaky and we haven't be able to determine the
root cause for it. Re-running the installation might help.
(Might) because we can't reproduce this manually.
Task-number: QTQAINFRA-3875
Change-Id: Id46d250a02e01007f03dfbb886d75b23c23a6216
Reviewed-by: Toni Saario <toni.saario@qt.io>
Add Squish for Web installation, update Squish license.
Pick-to:5.15
Change-Id: Id418830e82718afc20ac7390400342a6b0401a64
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This reverts commit 59f141ec3c.
Reason for revert: Provisioning will continue even if python installation fails
Change-Id: Iaa0a48a2179c2198a32fb9a4feb55266cc64c396
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Print verbose, debugging and error messages to log in case of installer
failure.
Task-number: QTQAINFRA-3875
Change-Id: I2a701a655bd5e9b434011d3c68a2d8a31e119103
Reviewed-by: Toni Saario <toni.saario@qt.io>
Add a new Ubuntu 20.04 host to be used for the qemu configs.
We might be able to use the RHEL 7.6 host artifacts for qemu target
configs, but i'd rather we test on the same distro / OS for both
host and target.
Use the macOS host for iOS builds.
Task-number: QTBUG-85623
Change-Id: I6305f924b843a5a832bd94e5060211583c9c7f98
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Latest Windows 10 v2004 needs more sleep for msys2 installation so that
gpg-agent will be killed after the installation process is finished.
Otherwise the provisioning won't continue and it will fail to timeout.
Task-number: QTQAINFRA-3691
Change-Id: I8b214415e777845e9ff711c1de9b09553b715d92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
These are missing from the initial patch:
716144073c
And currently block qtbase integrations.
Change-Id: Ife192aebf93b6344ff0341aed275ea2e104c6799
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This CMake version among other things, fixes a bug with
Ninja Multi-Config writing into the same response file
on Windows, which can cause wrong libraries to be linked
(mixing Debug and Release libs).
Also disable PCH for iOS configs, because that seems to be broken
again.
We can't upgrade to 3.18.2 because that breaks iOS PCH in a different
way than 3.17.4, and because of an AUTOMOC regression introduced when
using Ninja Multi-Config.
Fixes: QTBUG-85586
Change-Id: I04c08d3a8bfb88433f2d50f4d41d11fc0df3d7ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Add various CMake configuration flags to enable building of the same
sql plugins that the qmake configurations do.
While qmake has various introspection mechanisms for finding plugins
inside
qtbase/src/plugins/sqldrivers/configure.json and configure.pri,
in CMake-land we sometimes need to be explicit and pass 3rd party lib
paths, so that the FindFoo.cmake modules successfully find the
libraries.
Sometimes it's not necessary because the find modules also do some
introspection in default paths like looking /usr on Linux, or
'C:\Program Files' on Windows.
While some qmake configs provide mysql path hints (like on Windows),
the plugin is actually disabled on purpose due to licensing issues
as per a05bd71ede and QTBUG-76081.
Also the qmake configs specifying arguments like -plugin-sql-sqlite
and -plugin-sql-odbc is redundant. These switches force enable the
corresponding features in src/plugins/sqldrivers/configure.json,
but it's actually not necessary because all the features (except
system sqlite3) are auto-detected and enabled if the actual 3rd party
library is found. The same is the case for the CMake build, so there's
no need to manually enable the features.
While the qmake qemu configs don't explicitly disable the mysql plugin
and actually provide a Yocto SDK mysql path via -mysql_config,
the library does not end up being found. It's unclear whether this is
a bug (despite the licensing issue mentioned above) or on purpose.
But the CMake build doesn't find it either, so it's consistent.
And I suppose -psql_config /dev/null is meant to disable the
postgresql plugin on QEMU configs. The QEMU CMake build doesn't find
the postgresql library by default anyway, so the result is also
consistent.
Sql plugins built per packaging config:
macOS: odbc, postgres, bundled sqlite
RHEL: odbc, postgres, bundled sqlite
Win10 MSVC x64: odbc, postgres, bundled sqlite
Win10 MinGW x64: odbc, postgres, bundled sqlite
Android any arch: bundled sqlite
iOS: bundled sqlite
QEMU any arch: bundled sqlite
Task-number: QTBUG-86053
Change-Id: Ic759eb29fc5350cbdfe2825817af74767c4fb12a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The -no-qpa-platform-guard configure argument is deprecated and has no
effect.
Pick-to: 5.15
Change-Id: I132ccdf036c52baf54cf0c789fa063cc0455ce09
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The sccache may significantly reduce build times.
We need to evaluate real cases to see how much is to gain.
This patch enables sccache only on cmake, exluding one msvc target
with debug flag -Zi, which creates separate debug symbols.
Related sccache issue:
https://github.com/mozilla/sccache/issues/242
Task-number: COIN-130
Done-with: Aapo Keskimolo <aapo.keskimolo@qt.io>
Change-Id: Ic1f599c5194bcdee9528a548dabead1097821cd1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
We will ship pre-built binaries for minGW in Qt6 as well so add
packaging feature in it as well
Change-Id: I7b506fd0c8227cef478f461e02ae1d4549f0a507
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Earlier we set the env variable point to latest Python install. It
did work by accident, while the default python was installed as last.
Now each python install has its own matching ENV variable that can
be used buildtime. The PYTHON3_WHEEL_CACHE will now point to 64 bit
default Python3, while the variable is already used in Qt codebase.
Pick-to: 5.15
Change-Id: I6a67936c06ed0209ef9e903120f2416aaa8eb3ff
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Move the configuration from qtbase into a new
cmake_platforms_qemu.yaml file, and include it in qtbase and qtsvg.
Also enable CMAKE_AUTOGEN_VERBOSE to see what moc is being called
and with what parameters.
Task-number: QTBUG-83968
Change-Id: Ib893c6f8cb498b9b5c7da79218de22a28ffdb83f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
In many cases without waiting, next script would be missing network
and fails.
Pick-to: 5.15
Change-Id: Iab50945716860618b495029ce179183d844dc98a
Reviewed-by: Simo Fält <simo.falt@qt.io>
There is no 32 bit win10 configurations in CI, so we do not verify
any of the provisioning changes on it.
Pick-to: 5.15
Change-Id: I1c1e183908ffb09be4e2992ccbd1da7af2640181
Reviewed-by: Toni Saario <toni.saario@qt.io>
This installs Python 3.8.1 to be used with Qt for Python. It keeps
the old 3.6 as a default python3.
Pick-to: 5.15
Change-Id: I8ea121514f6a4092f700688363c282cbea37a75b
Reviewed-by: Toni Saario <toni.saario@qt.io>
CMake is picking up libtiff from the provisioned Strawberry Perl location.
Specify -DFEATURE_system_tiff=OFF in the NON_QTBASE_CONFIGURE_ARGS to
disable usage of that library, and thus fix the crashing test.
Amends 4b4f0be08d
Task-number: QTBUG-84886
Change-Id: Iecc880d367db76e91f8c5f92b0849f1ad43382a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The qtbase Coin instructions will start reading the values of the
environment variables NON_QTBASE_CONFIGURE_ARGS and
NON_QTBASE_TARGET_CONFIGURE_ARGS.
These are used to pass configure args to repositories other
than qtbase to allow disabling certain features per-repo.
Unfortunately we have to explicitly set the env var values to empty
strings so that the instructions work correctly, otherwise Coin
replaces them with a '<no value>' token, which breaks the
CMake configuration phase.
For some reason the issue only happens on the Windows MSVC
configuration, but we set them for the other configurations as well
to avoid any future breakages.
Task-nunber: QTBUG-84886
Change-Id: I4b095f71c6e484a0e67a53eb6ea9d5ca4f2a6a0c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Updated to match new default configurations.
Change-Id: I536454b5c3de4a4917cb8d1f0b391fbb20e6f8d1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The cmake platform was not updated when other platform were updated
to use -17 image.
Change-Id: Ide69d7d6119f472529570960021de9f05e53d8bd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Disabling LSO from the adapter gives us huge performance boosts
on Windows. In our tests 2 VMs within the same hosts had transfer
speeds of 30 Mbit/s with this enabled, and 2Gbit/s with this disabled.
Change-Id: Id794e7559c9e9005043361289a3db246a8528dd4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 97aa7a0031)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Disabling LSO from the adapter gives us huge performance boosts
on Windows. In our tests 2 VMs within the same hosts had transfer
speeds of 30 Mbit/s with this enabled, and 2Gbit/s with this disabled.
Pick-to: 5.15
Pick-to: 5.12
Change-Id: Id794e7559c9e9005043361289a3db246a8528dd4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Remove the DisableTests feature to force the qtbase instructions
to build and run the tests.
Task-number: QTBUG-84423
Task-number: QTBUG-83968
Change-Id: Ic904c7b0f3d6d6ab8a546d683b0110b0704bf42c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Switch the configuration to have release + developer-build similar
to the qmake configurations.
Add debug info for extra spiciness.
Specify a new env variable called QT_SYSROOT_FOR_RUNNING_TESTS which
will be used by the qtbase instructions to set QEMU_LD_PREFIX, which
is needed to run the tests via qemu.
Specify the QT_QUICK_BACKEND=software env var as well as the
GST_PLUGIN_SCANNER env var, because the qmake configurations do it.
Make sure to cross-build tools, because some of the tests like
tst_uic and tst_rcc expect the tools to be there.
Note that DisableTests feature is left on purpose, so we can decouple
the building from the testing in 2 different steps.
Task-number: QTBUG-84423
Task-number: QTBUG-83968
Change-Id: Icf6b12e6942c6ae6a0445eeac3f88704ca797148
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
CMake was picking up libtiff and libfreetype from Strawberry Perl
MinGW distribution. By specifying -DFEATURE_system_tiff=OFF and
-DFEATURE_system_freetype=OFF we should fix these problems.
-DFEATURE_system_jpeg=OFF was also added, even though tests are
not failing.
Task-number: QTBUG-84886
Change-Id: I324304bfbf8fcdb2de04ad0481eca1c7534a3cfd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Fix empty lines in .gitmodules, rather than failing to configure
with an error message that the line is malformed.
Quote all relevant values, to avoid errors that string REGEX does
not have enough arguments in cases when the parsed content is
malformed.
Remove some dead code.
Change-Id: I300a76f82fe174290442c659ca2e84391db361a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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>
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>
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>
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>
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>
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>
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 c671c2352e)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Node.js is needed by QtWebengine
Task-number: QTQAINFRA-3729
Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 122cf4cc0e)
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>
(cherry picked from commit fa58a227cd)
Reviewed-by: Toni Saario <toni.saario@qt.io>
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 b0286d6cd6)
Reviewed-by: Toni Saario <toni.saario@qt.io>
This reverts commit 48ff0140de.
Reason for revert: QtBase WinRT test qcoreapplication needs mpssvc service to be enabled
Change-Id: I523b668d9d7292aaaf7462585dc03819a3973010
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Service is still running. It need to be disabled.
Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Some files were not shown because too many files have changed in this diff
Show More
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.