Commit Graph

14 Commits

Author SHA1 Message Date
Samuli Piippo
c01d421714 qmake: fix all host path
Amend 769d4acc80 and calculate all host
paths correctly. This removes use of OE_QMAKE_PATH_EXTERNAL_HOST_BINS
which has never been part of Qt6, instead using OE_QMAKE_PATH_HOST_BINS.
Also remove generation of target qt.conf and the effective qt.conf paths
that are no longer required.

Fixes: QTBUG-140631
Pick-to: 6.10 6.9 6.8
Change-Id: Ie4eb25d60a93c476fdd1ffefe4e90fad50e91127
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2025-10-09 06:47:05 +00:00
Samuli Piippo
769d4acc80 qmake: fix path to external host bins
The OE_QMAKE_PATH_EXTERNAL_HOST_BINS is used for native host tools,
such as qmake, and it was working only for target builds. Calculate
correct path for native and nativesdk builds as well, taking into
account case where additional subdirectory is added to QT6_INSTALL_BINDIR.

Fixes: QTBUG-140631
Pick-to: 6.10 6.9 6.8
Change-Id: Ic8f36a64a6a43b0a073586a90ecf832482727dad
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2025-09-29 12:25:18 +00:00
Samuli Piippo
9b6d9d6287 Use correct QmlImportsPath config with qmake
Qml2ImportsPath is deprecated config and QmlImportsPath should
be used instead. This fixes qmake crash on aarch64 linux when
using GCC 14.

Pick-to: 6.9 6.8 6.5
Fixes: QTBUG-132288
Change-Id: I683ae7755b0b8ac496eeb8017c1c0d059b2fe011
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-12-19 06:48:14 +00:00
Valek Andrej
e3deb80e59 qt6: do not mix bitbake's and shell variables
Change-Id: If8eae76571574d9e6a98a591e8b9f03537c0670d
Signed-off-by: Valek Andrej <andrej.v@skyrain.eu>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2024-05-30 09:36:10 +02:00
Jeroen Hofstee
af73962f3d qt6-qmake: use the OE_QMAKE bindir and libexecdir
The bindir and libexecdir can be set to a different directory. Since
qmake and tools were searched for in the normal native staging bindir
and libexec dir, they would not be found. So use the OE_QMAKE version
of them instead.

Change-Id: I834bded248a79a6f0d18c6a32b4230f44ddf6a64
Pick-to: 6.2 6.3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-29 05:24:07 +00:00
Samuli Piippo
7e83f2fc76 Convert to new override syntax
This is the result of automated script (0.9.1) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Task-number: QTBUG-95705
Change-Id: Ieb57084e2cea47eb3407960ebfce404cee1ddc36
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 14:37:21 +03:00
Samuli Piippo
381dcb985d qt6: add support for QT_HOST_LIBEXECS
QMake has new config path for QT_HOST_LIBEXECS that's used for
tools moved from bin to libexec dir.

Change-Id: I7b8ea8c137ce93ff9d9f583eb8e333ab6b16c0bf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-03-10 09:31:09 +02:00
Samuli Piippo
21c1abd75b Add QMAKE_AR_LTCG
Amend 438c538fd285b33406633574f65dd5045baf8134 with QMAKE_AR_LTCG which
is needed when using LTCG configure option. Cleanup unused variables:
QMAKE_NM has never been used and QMAKE_CFLAGS_ISYSTEM is no longer used.

Pick-to: 6.0
Change-Id: Icdb9ba48f867ff30066d8fda0c223cc3b2be2c2d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-01-20 15:17:55 +02:00
Samuli Piippo
ac8056ef0e Add QMAKE_OBJCOPY and QMAKE_NM to mkspec
Needed to use the correct cross-compiler tools for objcopy and nm.

Fixes: QTBUG-90256
Pick-to: 6.0
Change-Id: I38048033b17d388b86612bc7205c4e22d948be29
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-01-18 09:44:52 +02:00
Samuli Piippo
c8b6dfd5e7 Use qt.conf to sysrootify the qmake builds
Instead of patching the qtbase sources, use the qt.conf to override
the sysrootify option for qmake.
2020-06-23 10:43:29 +03:00
Samuli Piippo
15d42fc22c Remove obsolete install fix for qmake builds
With recipe-sysroot now used, the concurrent installation
cannot occur and the install fix is not needed.
2020-05-19 09:48:58 +03:00
Samuli Piippo
c83312d402 Use syncqt from libexecs
syncqt is moved to libexec, but prf files still try to find it from bins.
2020-04-07 17:26:38 +03:00
Samuli Piippo
2f4aa0aff4 qmake: don't use recursive by default 2020-03-20 08:45:35 +02:00
Samuli Piippo
bcb8c13a7f Add support for qmake 2020-02-17 17:21:03 +02:00