The hard-coded path paths added to LIBRARY_PATH and CPLUS_INCLUDE_PATH
was not correct on Apple Silicon Macs, where homebrew installs into
/opt/homebrew/.
There's also no point in passing on the library location via compiler
environment variables, when we can use ODBC_ROOT. And we don't need
to pass it on as a CMake define, as a environment variable works just
fine. This decouples the provisioning of libiodbc from the build
configurations.
Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 124957a8cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1bb142175a)
This patch
- Replaces Android 14 with Android 15 as a maximum version
- Introduces Android 15 system image to CI cache
- Sets Android 15 as significant
Task-number: QTQAINFRA-6478
Fixes: QTQAINFRA-6653
Pick-to: 6.5
Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 2c85a91e07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f537715537)
The 'target' configurations currently trigger the 'host'
configure command line, and are duplication of the existing
rule we have for the host machines. Disable the top-level
configure checks for the 'target' builds completely.
Fixes: QTBUG-132799
Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 6f0c6b1614)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5b0d2e87d0)
The qttools qlitehtml submodule url was recently updated to use a
relative url like '../../playground/qlitehtml.git' instead of an
absolute path to code.qt.io repo.
Same for the nested litehtml submodule.
This broke initialization of the qttools repository, because the
init-repository script only normalized one '../' segment in the
submodule url, instead of all of them, which ended up trying to clone
a non-existent git://code.qt.io/qt/../playground/qlitehtml.git repo.
Apply the url normalization in all the code paths where there might
still be '../' segments in the url.
Change-Id: Iaa8e58104c92858318ad66aefa5a38d63ad7a155
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ff25d705a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 22ae1bb5ee)
This will use the newer iOS 17 SDK during the build, and allow us to
enforce the minimum SDK version check.
This change also switches to using an arm mac for the build.
Task-number: QTBUG-119490
Change-Id: Ie9ff2b2f4fe40bda2856d4b12a03aaa05f836de4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f5970f9c62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6db401beda)
There's possibility that some installations might add more into
Path that doesn't get visible during the installation process.
Change makes it easier to detect if there's i.e. JRE installed during
Mimer, which caused Java SE update to 17 fail in qtbase build for
Android, because JRE was the first Java found from Path and it
wasn't the required new JDK 17 version.
This can lead even to test with incorrect version of Java, which can
happen with any other different version installations as well.
Task-number: QTQAINFRA-6392
Task-number: QTQAINFRA-6385
Change-Id: Idce79eb06d73894ae648e0be53ff1f07bb21392d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 444167f5fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5ae41db586)
Add -j4 to limit how many cores is used to build ffmpeg-ios binaries.
Error in logs: "posix_spawn failed: Resource temporarily unavailable"
Task-number: QTQAINFRA-6803
Change-Id: I3fb56cdbe4cbda8f779852b0a16121916aa5a1d4
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 6569f201c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b7abace894)
'InsignificantTests' are removed from all RHEL-9.4 targets
[CI Platforms]
Task-number: QTQAINFRA-6362
Change-Id: Id034a3f4cfa63e2f8813fad1e25a3bcc2b365851
(cherry picked from commit 490769cdef)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Ubuntu 22 arm64 target is missing packages to mount ci-files01 for Squish.
Task-number: QTQAINFRA-6212
Change-Id: Ia5c38f12f2c6ce8ff19d2d46ce1e46f6e1c627f0
(cherry picked from commit 64bd882464)
Reviewed-by: Simo Fält <simo.falt@qt.io>
The documentation warning configurations marked with the TestDocs
feature will now use the new doc tools building instructions from
qtbase, instead of using the provisioned qdoc tools when checking the
documentation for warnings.
This means that each qtbase integration will build the doc tools
from qttools/dev/HEAD and use those built tools associated with that
qtbase sha1 integration to check documentation in all other
repositories.
The doc tools will be rebuilt whenever a new qtbase integration
starts.
See the qtbase commit 1f646bb978ed94c25f6224e801779c929096c0ae for
more details.
Task-number: QTBUG-128730
Change-Id: I5a981afa9ec2c2b3a5c519b961e566ec5d2cc925
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit d36c17487c)
To get as close as possible to how developers build and run
tests, and to get debug-build test coverage on macOS in CI.
Change-Id: Ice12b7230d56284d352e6a73ac503588b22107bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 8c74d54deb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Jenkins needs Java 17 to run agent on VM
Task-number: QTQAINFRA-6263
Change-Id: Ia2749a4812402df8b11f6388f8e6bc3b995d5e53
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 7a2a226e8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The h264 codec is required to run the gstreamer-based unit tests on CI.
Change-Id: Ic47ee086687230613d56f30d3fd613288e37ce7f
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 58e0090020)
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
RHEL-9.4 will be run in parallel with RHEL-9.2 with insignificant tests
until RHEL-9.4 is confirmed stable, then it will replace RHEL-9.2.
[CI Platforms]
Adapted for 6.8:
* remove install-firebird.sh, which is only in dev
* remove 90-install-oracle.sh, which is only in dev
Task-number: QTQAINFRA-6362
Change-Id: I92c10a15346e7bd0c0190a8d6a6513cf6143d2a8
(cherry picked from commit ee8ee93d91)
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
GHS compiler license has expired.
Change-Id: I5f495d24b5693c1841cb292d791188e1f3896d93
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e306818660)
Reviewed-by: Simo Fält <simo.falt@qt.io>
We don't use any configurations for packaging, the feature doesn't
trigger anything.
Change-Id: I977566123b491284e029cf1d828c0ce0a36703f2
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit c4d897e380)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
