We need to disable GDS feature to solve OpenSSL library linking issue
Fixes: QTBUG-93759
Pick-to: dev
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
QtDeclarative, QtImageFormats and QtShaderTools
Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dd24bc25c9)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 401ef8a8b3)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
We will add new module targets for Integrity. Those are not tested
during Qt5 integration. Let's remove the flag after we are sure that
nothing will break on those new targets
Change-Id: Ifdcecc869a931897e377281618dfce744353b47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@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>
(cherry picked from commit b5c4effe7e)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Currently will only build tests/auto/cmake projects in qtbase.
More work is needed for the other repos.
Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 4fea3be3af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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.
Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 6ac98447b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use more of the same arguments as RHEL-8.2-host to limit
the unnecessary dependencies to the system libraries.
Task-number: QTBUG-95882
Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
That is used by our Jenkins setup for packaging.
To keep things simple, just include the cmake_platforms and
Qt Creator's config.
Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit bbd31689ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.
Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4b8c908b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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
Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f945fdc735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This repository has been merged into qt5compat.
Change the 'recommends' field of qtquickcontrols2 from
qtgraphicaleffects to qt5compat.
Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit cec25d2ac6)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Task-number: QTBUG-95173
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9b3411da8d)
Reviewed-by: Daniel Smith <Daniel.Smith@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)
Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f8fab3be9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
It's now a part of qtdeclarative.
Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ed7a7e75ff)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This repository is not available in Qt6.
Every repository that recommended qtquickcontrols already recommends
qtquickcontrols2.
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>
(cherry picked from commit 149cc2ebc0)
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.
Task-number: QTBUG-95018
Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4180e9c511)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
To avoid error 'too many path components' when building Qt on Windows.
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>
(cherry picked from commit e8b0be7711)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Qt purchasing was not part of Qt 6, and will be moved as a demo/example
under qtdoc, thus we don't need it here.
Task-number: QTBUG-84776
Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit eb16fe519f)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Script was pointing to incorrect version and the prebuilt version
was missing from cache. OpenSSL Android is now rebuilt and cached.
Pick-to: dev
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Following qtandroidextras removal in the commit
912fdda4a4, coin's platform
config yaml file has to be removed.
Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit f1fcb89f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
... to avoid unnecessary dependencies.
Pick-to: dev
Change-Id: I607f034d5b092e69e7d2aead4c0747268b690a5d
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well
Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 4131439fb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 1c17b656e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Timeout increased so this should be ok to move back to Redhat 8.2
Pick-to: dev
Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Copy the global and config folder from under qtbase to directory from
which the documentation.tar.gz is created. This is similar to how these
are added in qmake builds.
Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7ed6d04410)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The config is marked as Packaging, but it didn't specify the list of
CMake configurations to build and defaulted only to Debug.
Task-number: QTQAINFRA-4492
Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 52eebe8a89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.
Task-number: QTBUG-84382
Pick-to: dev
Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382
Reviewed-by: Simo Fält <simo.falt@qt.io>
According to plan Qt Multimedia will be back in Qt 6.2 so let's add
it in official builds
Task-number: QTBUG-93129
Pick-to: dev
Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Submodule update bot didn't do this because of some reason so try this
manually instead
Change-Id: Iaaad962fec9e56f0a46ab7934c9172eefd328322
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This will allow exporting the testlogs for release.
Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9673311626)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.
Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 6069cf9a84)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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>
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.
