Commit Graph

22 Commits

Author SHA1 Message Date
Samuli Piippo
5f20803d1c Add option to export example sources
By default, the example sources are not exported with the binary,
as was the case in qt5 times. Add options to enable the export
using variable QT_INSTALL_EXAMPLES_SOURCES = "ON".

Pick-to: 6.8
Change-Id: Ieedb65034264086b84d4df541480cbb02ecb82f2
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2024-12-09 06:30:22 +00:00
Samuli Piippo
958cb1592a Include SBOM files in -dev packages
Qt now produces SBOM (Software Bill of Material) files, include
those in the -dev packages.
The file cointains references to buildpaths, get rid of those
until fixed upstream.

Pick-to: 6.8
Change-Id: Ibe2972649db74925aab3fbe0307fd679e1ea53bf
Reviewed-by: Alex Bu <alex.bu@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-29 14:04:48 +00:00
Samuli Piippo
259ef13336 Remove TMPDIR references from qmake files
Qmake files still have references to build time paths
that cannot be mapped to any real runtime path.

Task-number: QTBUG-105913
Pick-to: 6.8
Change-Id: I047a21204e2154cbf36c8417ae0e2e63be45564f
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2024-10-18 12:48:06 +00:00
Samuli Piippo
23feda4f5b Add workaround for broken harfbuzz cmake config
Latest harfbuzz 6.0.0 has bad cmake config that uses absolute paths,
which breaks static builds for Qt. Add workaroud that causes Qt
to use pkg-config to find correct paths for libs and includes.

From qtshadertools build:
ninja: error: '/usr/lib/libharfbuzz.so.0.60000.0', needed by
'lib/libQt6ShaderTools.a', missing and no known rule to make it

Pick-to: 6.5 6.4
Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-11 14:45:12 +00:00
Samuli Piippo
2f6951d07b Don't force tools for target
Compile time tools are not generally needed on the target.
Don't force them by default, but make it possible to enable
them with QT_FORCE_BUILD_TOOLS = "ON".

Task-number: QTBUG-99702
Change-Id: If2d3ce9252213b28cc06efe0e9c5cfd57db81371
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-14 08:06:25 +00:00
Samuli Piippo
6ed90874a6 Disable file cache for shadergen
QtQuick3D's shadergen uses cache from user's home directory.
Disable the caching as it can lead to problems with pseudo.

Change-Id: I6b889fe94eb218d803ece49c9e0ca4ec18c3524a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-11-08 08:15:20 +00:00
Samuli Piippo
8fb6c082d4 Remove QMAKE_PRL_BUILD_DIR from prl files
Reduce warnings from buildpaths QA test (contains reference to TMPDIR)
by removing QMAKE_PRL_BUILD_DIR from prl files.

Pick-to: 6.4 6.3 6.2
Change-Id: I1a5fbac82c4a026b6ba41db3b0cca6a9fbf1e31a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-08-24 12:32:14 +00:00
Samuli Piippo
35c8457a39 qt6: force all tools to be built
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING is deprecated in favor of
QT_FORCE_BUILD_TOOLS.

Change-Id: Ibd644adabe9cdd8bd39179c38974d953ce34e5a4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-05-13 07:31:29 +00:00
Samuli Piippo
312d7185d8 qt6: make configure more verbose
Qt configure has lowered its verbose when not using developer-build.
Increase the verbose level to have the configure summary of the
Qt module back into the logs.

Pick-to: 6.3 6.2
Change-Id: If742b68353fe6f0614bf4be8f355cfc24f9a42f3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-04-05 08:14:46 +00:00
Samuli Piippo
cbac31ee90 qt6-cmake: inherit pkgconfig
Static build needs pkgconfig for every Qt module. Include it already
in qt6-cmake class instead of in each individual module.

Pick-to: 6.3 6.2
Change-Id: I065382ee49d6b40b76ede9e632d17221451de8d1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-01 06:00:46 +00:00
Samuli Piippo
17c05714ad qt6-cmake: remove unncessary directory separator
Pick-to: 6.3 6.2
Change-Id: Ie4ced4340bcf672cfbf7f034283beb53c93dbd92
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-01-20 15:56:15 +02:00
Samuli Piippo
3bb76773a8 qtbase-native: don't try to find tools
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING triggered qtbase-native
to try to find tools from QT_HOST_PATH, which obviously
doesn't exists yet. Use it only for target and nativesdk
builds.

Fixes compilation failure:
 | -- Searching for tool 'Qt6::moc' in package Qt6CoreTools.
 | CMake Error at cmake/QtToolHelpers.cmake:122 (message):
 |   Neither QT_HOST_PATH_CMAKE_DIR nor Qt6HostInfo_DIR} available.

Pick-to: 6.2
Change-Id: I260526c08f48f179049eb4b0ab3e6561958d0a53
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-08 05:20:06 +02: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
e400d8ff3c Use QT_HOST_PATH only with target and nativesdk builds
Native build cannot use QT_HOST_PATH as it doens't exists yet.

Change-Id: I4ca81b15b13e1fe422f04b334eeab058e7db0c9d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-09-30 14:46:46 +03:00
Samuli Piippo
6b57024c9a qmake: patch prl and pri files
Replace host paths with qmake built-in properties
2020-06-09 15:00:59 +03:00
Samuli Piippo
a6f0dd9305 Update modules
Remove merged patches and remove unneeded patching from qtbase.
2020-05-25 08:37:02 +03:00
Samuli Piippo
4ef5a29445 Add support for building toolchain
A WIP patch that supports cross-compiling tools needed for the
nativesdk. Patching needed for the cmake files to work in
the relocated sdk.
2020-04-28 17:38:43 +03:00
Samuli Piippo
fe753369b5 add dependency to perl 2020-03-25 12:34:35 +02:00
Samuli Piippo
bcb8c13a7f Add support for qmake 2020-02-17 17:21:03 +02:00
Samuli Piippo
250391d3a4 Use INSTALL_MKSPECSDIR 2020-02-13 09:26:07 +02:00
Samuli Piippo
92e625526b Fix install paths 2020-01-29 09:57:48 +02:00
Samuli Piippo
7d63e448b7 initial commit 2020-01-24 11:54:52 +02:00