Change the absolute host paths in qt.conf to relative. This allows
SDK to work in Windows without need to patch the paths.
Change-Id: I0a3f6e793b033d727f7633c022b27392acc91823
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7ac9c84014)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
More modules are installing tools to libexec and none have
any runtime binaries there. Include it in the *-tools packages.
Change-Id: I2ed65bc4f88982ef91d2d5758624c16c32a082d6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ac597001df)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
QtGraphicalEffects has been moved to be part of qt5compat
module for compatibility with Qt 5 code. This can be accessed
by importing "Qt5Compat.GraphicalEffects
Change-Id: Ia3478e300938a9c612472bf98256d0f521489c33
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 29999c4ffb)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Add needed envs to the default toolchain file used when
the setup-environment-* script have not been used.
Fixes: QTBUG-93896
Change-Id: I5dc1773152b87f0c11434643de75386ddd999f72
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 22f55689b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
QT_HOST_PREFIX should point to the root of the host sysroot.
Change-Id: I7bb02df58da432ef70dba47f5e5866948f121c53
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f850278548)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use correct branch for assimp on QtQuick3D and Qt3D and include
the assimp lisense file. Fix system-assimp PACKAGECONFIG, but
don't enable it since the the default assimp available in oe-core
is too old for QtQuick3D.
Change-Id: Iee959777b8f192a6512b2568ba7f6fa94a120535
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 4325285fb9)
Some of the tools were moved to libexec, package all of those
into the tools package.
Change-Id: Ib8d3dbe1821591101febf0ecedc526edc9b56366
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c7108eb5a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Hardknott Yocto version is now available, add it to the CI builds.
Only dev branch remains tested against Yocto master.
Change-Id: Iec1227d616ff95b8406217f4d18ebfba80a0300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c9da0eaec3)
Set QT_HOST_PATH to the SDK path only if it has not already been set.
This allows using the SDK to rebuild Qt using different host Qt.
Task-number: QTBUG-92052
Change-Id: I39991ef6d95d0f9e21590dc8dccb39ec8107d8c7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit dfa089d0dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
... to allow build without opengl and to make qtdeclarative dependency
optional using PACKAGECONFIG.
Change-Id: Idc8e73e38c9eb10f2f18c547530654a7c6e3f19f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9923954c23)
Add RRECOMMENDS for all the dynamic translation packages to the main
qttranslation package to allow easily include all translation files
in the image.
Change-Id: I564d4fe704a8b88e14d94154c3283e58d52ddb21
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 019581cff7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Add separate packagegroup recipes for essential and addon
Qt modules and make sure all modules are included in those.
Avoid unnecessary dublication with packagegroups and remove
the toolchain target packagegroup, instead use the combined
qt6-modules packagegroup for the toolchain as well. This will
install all development packages as long as SDKIMAGE_FEATURES
has dev-pkgs enabled.
Cherry-pick updated to contain addons available in 6.1.
Task-number: QTBUG-91902
Change-Id: I574da02ae1632c1e41490a1244398f31eaeeb97b
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit e60fed4f98)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Move all the builttime tools back to bindir when building a Windows
SDK. This saves us from adding mingw libraries to the libexec dir
needed by the tools.
Fixes: QTBUG-91895
Change-Id: I4da0f03190e3862e93c49fbd267baf567bf7a5d5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 212ae9b201)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
SRCREV updated to latest from 6.1 branch.
Change-Id: I25a4a980b9aff1e15585c8c1bba4459e74fa266f
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 67c94eee72)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Some of the tools have been moved to libexec dir and need to have
the qt.conf available there as well. Amend also commit
381dcb985d so that qt.conf in the SDK
contains the path for the host libexecdir.
Task-number: QTBUG-91756
Change-Id: Id76b603d1107dd70c63be7682007e4c34621750a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f55ee894d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Update to new proposed Qt 6.1.0-beta2 (previous snapshot
was not final beta2).
(Amends commit db9e6b5a61)
Task-number: QTBUG-90009
Change-Id: I167a6dcfbdd1d9ad735ad52c3ef9abbb50b4c068
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
The default PACKAGECONFIG[examples] only works for cmake projects,
add correct arguments when using qmake projects. Skip QA check for
dev libs (.so) in example packages.
Change-Id: I559395f3bfcb64d54e2f8ede4bbdf07c5aa617e9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 1933970950)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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>
(cherry picked from commit 381dcb985d)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Remove unneeded macOS and Android specific scripts that depend
on perl and bash which then cause file-rdeps QA issues.
Change-Id: I877461fdcffc4fee5b29e929ad8ac2d30a2e980a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fe0c4887c3)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This module is part of Additional Libs from Qt 6.1 onwards.
(6.1 branch revision initially set for 6.1 Alpha release revision)
Change-Id: I5b6b952e555da225a110f8821623a422c9cba772
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 55707395a9)
This module is part of Additional Libs from Qt 6.1 onwards.
(6.1 branch revision initially set for 6.1 Alpha release revision)
Change-Id: I0f33bad251dd2a77eba469b94561b0284c175ae5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit cf4dafd3cf)
The minimum required cmake version is now 3.16, no need to
override it anymore.
Change-Id: Id31d5a88e61e0dc4f2a78448482c61a894a59d94
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7057c72ca9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
