Commit Graph

4 Commits

Author SHA1 Message Date
Tor Arne Vestbø
e8a94de2ea 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.

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)
2025-02-03 21:00:50 +00:00
Samuli Piippo
83b40b020d WoA: update template
WoA template got updated in 2151c5510f
and 0f18b0bc2f, but not everywhere.

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>
(cherry picked from commit b07fbbf935)
2025-01-03 22:02:10 +00:00
Elias Toivola
95234b04c0 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.

Change-Id: I602976a0214f6e0f4661e6b876c0710bc3ea9df9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 293aeab453)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-10-21 18:46:41 +00:00
Samuli Piippo
1ee0e99036 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.

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>
(cherry picked from commit 21e8dd696b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-10-01 20:40:26 +00:00