Commit Graph

7 Commits

Author SHA1 Message Date
Tor Arne Vestbø
77a614d592 macOS: Set PostgreSQL_ROOT during provisioning rather than in each config
Decouples provisioning from build configurations.

Pick-to: 6.8
Change-Id: I53b0983ab8b20c40568c1b5b9a24bfe3c62cf531
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7f51bdbd8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:39 +00:00
Tor Arne Vestbø
55ef82de88 macOS: Set Protobuf_ROOT during provisioning rather than in each config
Decouples provisioning from build configurations.

Pick-to: 6.8
Change-Id: Ied2b60b360ef5ec5aab1dd4b2e6a0b81032d2938
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit ac2b15075c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:37 +00:00
Tor Arne Vestbø
1bb142175a Use correct path for libiodbc and forward via ODBC_ROOT env var
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.

Pick-to: 6.8
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>
2025-02-02 23:32:28 +00:00
Samuli Piippo
b07fbbf935 WoA: update template
WoA template got updated in 2151c5510f
and 0f18b0bc2f, but not everywhere.

Pick-to: 6.8
Change-Id: Ie2ee9e62f9bc10753bd527a2b1a7edc5de46ca60
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 69dfa0449c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-03 20:46:04 +00:00
Elias Toivola
0148e13038 Windows 11 23h2: Install Windows SDK 10.0.26100.1742
Change Windows 11 23h2 x86_64 tier-1 template -53 -> -54, where Windows SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: I713ea4d5032145a92d7bcbccec6c98543cbc90d2
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 4bfe8b9d71)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:59 +02:00
Elias Toivola
293aeab453 Fix SSH for RHEL-8.10
Red Hat 8.10 VM template -50 does not have a user set for SSH. This is
fixed in template -51.

Pick-to: 6.8
Change-Id: I602976a0214f6e0f4661e6b876c0710bc3ea9df9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-10-21 07:24:34 +03:00
Samuli Piippo
21e8dd696b Update platform configs for QDB and flashing wizard
Create common yaml for building static release packages
for all host platforms, including arm linux and windows.

Pick-to: 6.8
Task-number: QTBUG-117504
Task-number: QTBUG-117819
Change-Id: I8ee78eb9aa4fa5150141227e3367dee1be10f907
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-10-01 15:05:10 +00:00