We don't load it for qtbase standalone tests, we shouldn't for
top-level builds as well.
This brings us one step closer to fixing top-level standalone tests.
Change-Id: I7c2710e61951f6789fea63422bc575a1ac611cdc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c971db7e5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use the same prebuilt pacakges for all platforms since the prebuilt libs
are going to be used for the target and they are not tied to the host.
Task-number: QTBUG-110025
Change-Id: I2c79722989902b16883b31cbc6e140855239fcc8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 4e59702b14)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.
Pick-to: 6.5.1
Change-Id: I0c1b6602423b97f5be5dd7d146a37a3f41eced00
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
To simplify testing modifications to the FFMPEG library, it is nice to
be able to rebuild FFMPEG without having to manually delete lib files
first. This change makes this possible because it uses powershell
Move-Item instead of Rename-Item to rename .o files to .lib files.
Move-Item's -Force argument allows renaming files to destination that
already exists.
Change-Id: I0a56776d38c37d38d1cd74b5186881fc955d51f0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c4d26fe1d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The conan experiment has ended, and the files are only bitrotting
nowadays.
Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8214de5e0e)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
The only host is down for now.
Change-Id: I82cc9461a16d054da6611f2e2ee0be6426755660
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 82327bfc4d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
(cherry picked from commit bb13b7dadf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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ø <tor.arne.vestbo@qt.io>
(cherry picked from commit cf4eabc8c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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) <alexandru.croitor@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 6c40b6160e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <volker.hilsheimer@qt.io>
(cherry picked from commit e1b7e865ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <assam.boudjelthia@qt.io>
(cherry picked from commit ef12163e25)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
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 <samuel.mira@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 84df93d37e)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Added install-ffmpeg-android script for the android cross-compile
Removed android stuff from install-ffmpeg
Changed the yaml variables to include the target arch
Added the arm64 target arch
Task-number: QTQAINFRA-5476
Change-Id: Id9609ed0427f2fc42f7f27e7787a81ad145f59be
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 99afe7199e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.
Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit aed030bb90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7ad2801f92)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <kai.koehne@qt.io>
The photosurface demo uses a custom shader and the PDF image plugin.
The document viewer also needs QtPDF.
Task-number: QTBUG-108924
Change-Id: I1236e6b679dc512874299747921407384ce29a67
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6ed6f5f220)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Not needed anymore
Change-Id: I9b813a66593525a2328bed95c128b5979a410fc7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit f080b88d85)
