Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.
Change-Id: I0c1b6602423b97f5be5dd7d146a37a3f41eced00
Reviewed-by: Teemu Holappa <[email protected]>
(cherry picked from commit 7d3fec671f)
The only host is down for now.
Change-Id: I82cc9461a16d054da6611f2e2ee0be6426755660
Reviewed-by: Jukka Jokiniva <[email protected]>
(cherry picked from commit 82327bfc4d)
Stop the configuration and show an error if one of the submodules is
missing, or misspelled in `-submodules` option.
Fixes: QTBUG-114133
Change-Id: I890d4f5f0614288a2be422f839e04a0086a58403
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Alexandru Croitor (OOO) <[email protected]>
(cherry picked from commit bb13b7dadf)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
The CMakeUserPresets.json file can be used to simplify configuring Qt,
particularly with tools such as Visual Studio and Visual Studio Code.
As opposed to the CMakePresets.json, the CMakeUserPresets.json should
only contain user specific configurations, and should never be checked
into source code management system. Therefore it makes sense to ignore
it globally.
Change-Id: I971d4505b302dc40e3dd33b6d4680c2067047c27
Reviewed-by: Tor Arne Vestbø <[email protected]>
(cherry picked from commit cf4eabc8c2)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
The cloned submodules had a wrong origin remote URL if the origin remote
of the local qt5.git repository had a trailing slash.
Fix this by stripping the trailing slash when stripping the trailing
".git" from qt5.git's remote.
Fixes: QTBUG-113793
Change-Id: I199b6e1915f67558ecfe69f7300d0f9ef0d4b232
Reviewed-by: Alexandru Croitor (OOO) <[email protected]>
Reviewed-by: Edward Welbourne <[email protected]>
(cherry picked from commit 6c40b6160e)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
Openssl library causes backward compatibility issues. We need to disable
it to make ffmpegmediaplugin work on all supported linux platforms.
Fixes: QTBUG-113324
Change-Id: Ib266e2cf67e9336fb206735b8b2418fccd8f7b00
Reviewed-by: Volker Hilsheimer <[email protected]>
(cherry picked from commit e1b7e865ec)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
Android 13 replaces Android 12 as max version in CI.
Android 6 kept as minimum version of Android in CI.
Task-number: QTQAINFRA-5392
Task-number: QTQAINFRA-5431
Change-Id: If85c6f63d52055e2ba95f92c154b20a6b809c7dc
Reviewed-by: Assam Boudjelthia <[email protected]>
(cherry picked from commit ef12163e25)
Reviewed-by: Rami Potinkara <[email protected]>
Reviewed-by: Heikki Halmet <[email protected]>
We pick the oldest build tools we can find because there is lower
chance that the produced binaries will be incomaptible with the newer
version of MSVC.
With the current provisioning design we also cannot change the MSVC
version for the each package on demand. Once Enter-VsDevShell is called
it litters the powershell environment and blocks the use of
Enter-VsDevShell second time. It could be better to run each .ps1 file
in own instance of powershell to avoid mixing build environment.
Amends f58afd5476
Change-Id: Ie752cfc8b69ed985e61ec16209007dd586611866
Reviewed-by: Samuel Mira <[email protected]>
Reviewed-by: Artem Dyomin <[email protected]>
Reviewed-by: Ville Voutilainen <[email protected]>
(cherry picked from commit 84df93d37e)
Reviewed-by: Alexey Edelev <[email protected]>
Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.
Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <[email protected]>
(cherry picked from commit aed030bb90)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
qtbase was last insignificant module. When below "needed to"
are in, qtbase can be mark as significant.
Needed to
- increase emulator RAM to 16GB
- RAM increase to 16GB fixed tst_QByteArrayLarge cases
- SKIP tst_QRhi::tessellation(Vulkan)
- SKIP tst_QOpenGLWidget::reparentHidden
- SKIP tst_qvulkan cases
Above SKIP bugs to be fixed later in Qt 6.5 as bugs.
Task-number: QTQAINFRA-4733
Task-number: QTQAINFRA-5391
Task-number: QTBUG-108832
Task-number: QTBUG-108844
Task-number: QTBUG-111235
Task-number: QTBUG-111236
Change-Id: I5d3e99ad144dbcf192873458dedd0300ed622beb
Reviewed-by: Heikki Halmet <[email protected]>
Reviewed-by: Assam Boudjelthia <[email protected]>
(cherry picked from commit 7ad2801f92)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
Update qtattributionsscanner to the latest version from dev branch,
b3630c56. This includes support for SecurityCritical and Comments
fields. It also fails the build on incorrect input files, ensuring
no incorrect content can integrate.
Update qdoc to the same version from qttools, bringing multiple
improvements.
Fixes: QTQAINFRA-5450
Change-Id: I7caa59ed982d9c41efcbe3d2381d47c7d037e9c6
(cherry picked from commit 195a438395)
Reviewed-by: Kai Köhne <[email protected]>
Not needed anymore
Change-Id: I9b813a66593525a2328bed95c128b5979a410fc7
Reviewed-by: Jani Heikkinen <[email protected]>
(cherry picked from commit f080b88d85)