Commit Graph

10 Commits

Author SHA1 Message Date
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