Change-Id: I464f6cdedf02185876a57f4cafad47d5f60f10b4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e8102f036a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Change-Id: If4c6822c71e627d973b55f9edad382a4d6088acd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 910ec2e260)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Newest version is 4.4.1 so update it in the git as well
Task-number: QTBUG-101714
Pick-to: 6.3 6.2 dev
Change-Id: Ifd65867cc25abacd37bf1e90c0638bc50ac476b5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
qtdeclarative-tools has runtime tools, such as qmlscene,
that can be useful in the image.
Change-Id: I359611f8a3e575d8b18b63c4f8a034ad5ab705a1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit c3d4a5722f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Kirkstone has been updated with working nativesdk-python3
builds and qtinterfacewramework can now be included in the SDK.
Change-Id: Ibcaf520688a56f9607db89993aa9ec9e2d667844
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit bc0717a20b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Prepend PATH env with the path to the bin directory in the cmake
toolchain file. This let's CMake to find CMAKE_MAKE_PROGRAM (make or
ninja) without need to specify it explicitly when using the qt-cmake*
helper scripts.
Change-Id: Ic7ce057421395d98158b3ad6e529f30b629bdded
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit eaee55e9fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
CMake and Ninja combination does not support changing RPATH on Windows hosts,
even when cross-compiling. Add CMake configuration to workaround this.
Change-Id: I5d82c0a7f91cf81a0b3ed7c0f14aeccc36464f91
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 554b947ba4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Make sure the qt-cmake* helper scripts get correctly created
for mingw toolchains.
Change-Id: I0ec6c4e12abf375677226ea32a6c36066a990f3b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3d122c668c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Skip qtinterfaceframework also with kirkstone now that master
branch is using kirkstone as DISTRO_CODENAME.
Change-Id: I8ff7c9c3289d4f2c8864c14a6abcf61fe34250a6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b32b7f2774)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Generate Conan profiles that can then be used with the SDK.
Task in qtbase generates profile that has all the architecture bits
and configure arguments in place. The profile added in the SDK phase
lets Conan recipes know how to use the SDK with the QT_CONFIGURE_MODULE
environment variable.
Change-Id: I33a9b0f3915417d98ad12559ce7661c92b1cc739
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit a64c978983)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
MinGW toolchain doesn't perform relocation during installation,
so all the absolute path point to the temporary sdk paths.
Use the location of the toolchain file to get the absolute
paths at runtime instead instead of using external SDKPATH
env for it.
Change-Id: I699b2178baf5cc855a57186056341b6c6eefbbf5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 0ef2348d49)
The default OEToolchainConfig.cmake uses environment variables
to set all the cmake variables in place. The Qt6Toolchain.cmake
chainloaded the same toolchain file after setting everything to env.
Rewrite the Qt6Toolchain.cmake now to set all the cmake variables
directly without using environment variables or chainloading
the origin OEToolchainConfig.cmake.
This allow better integration to QtCreator that might be used
to modify the compiler flags for projects.
Change-Id: I7c7c42ec17c86f53b62ed557d9b61d5d19abc1e0
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 5cbac6cf35)
The common license files have been renamed to use SPDX names, but we
still support some older yocto branches that use the old names.
Add mapping to allow building with older yocto version after the
recipes are updated to the new license names. This avoid warnings:
No generic license file exists for: GPL-3.0-only in any provider
Change-Id: Ib93baf9027442e69ab5bce294449bd203d9be2aa
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f80f96848d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use correct path for the test sources and data.
Change-Id: I90f14130dce7f3b5ef3ae45dbdd60540c795ba9e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d1ffa135a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Additional check was added into the bb.fetcher that needs to be
workaround in srcrev_update task. Otherwise task will fail with
error:
Exception: bb.fetch2.FetchError: Fetcher failure: Recipe uses a
floating tag/branch without a fixed SRCREV yet doesn't call
bb.fetch2.get_srcrev() (use SRCPV in PV for OE).
Change-Id: Ib3c2665257c344c312074519a03d96437866cd8d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6492c16955)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Some of the python3 recipes we carry are already in meta-python
layer, but not in all the branches that we support. In order to use
the most recent recipe, we need to have same or lower BBFILE_PRIORITY
than meta-python. Depending on the branch, meta-python's priority is
either same or higher than the core layer's priority.
Change-Id: I98c74858c5be69e45a76a45ed10aa1168c614618
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d36033ca56)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
In kirkstone, some of the variable have been renamed to
use inclusive language.
Change-Id: Ic03fc3a748ea6a4e3e510040b9cd6b5e038d4662
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2d4825f309)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Restructure the Coin build configs so that all configurations
are already in .inc files that can be easily included.
Change-Id: I93d74254804b7d17106a3f08af2973464e669928
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0708a33ea6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
native-qtdeclarative is needed to take advantage of qmlcachegen
and qml script compiler.
Change-Id: Ie78b3401a1f4dfe252970f8c0b1dea70c0c0c954
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9471cb966f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
meta-openembedded/master has issues building certain python3
modules for nativesdk. For python3-qface, failure is from dependency
chain: nativesdk-python3-qface
-> nativesdk-python3-watchdog
-> nativesdk-python3-requests
-> nativesdk-python3-pyopenssl
-> nativesdk-python3-cryptography
Don't include qtinterfaceframework to sdk when using master branch
with poky until all modules can be built correctly.
Change-Id: Id2837f1363a22cb28e45c1165631cfa3f37756a7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit b2ccd0bd60)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
All references here to BSD actually mean BSD-3-Clause.
Change-Id: Iec43070c5245d053259c215311f238989741c85d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 154c396c57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Paths in mingw toolchain are not relocated when installed, so we
need to use relative path for the Qt6Toolchain.cmake file.
Fixes: QTBUG-100642
Change-Id: I48542f20f4443c8130f89c2436f5b0ecea914bb0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e78c281c0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This reverts commit fff02af10d.
Auto test build issue has been fixed.
Change-Id: I55ef6f7aec1a5695089b1fb62e5b6aafb4299d70
Pick-to: dev
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This reverts commit 68bd9cee63.
Proper fix has been merged to qtbase.
Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29
Pick-to: dev
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Catch2 was updated in qtbase, patch is no longer needed.
Change-Id: I762e27a49ddcc325c5911e36bb65aab24b0b78cb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9080dc9fe0)
For static Qt builds, it's useful to allow disabling ptest for all
Qt modules without removing ptest from DISTRO_FEATURES, since that
would cause rebuild of most of the system components.
Change-Id: I32aa202ce8e4a1260e287b0625495ef828536511
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a730a1f029)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use manifests to fetch meta layer repositories. This enables
us to easily pin the upstream layers to specific revision if
and when the latest revision gets broken.
Build again against master branch, the manifest is pinned to
working meta-openembedded revision.
Change-Id: I5d217f6932aaf5eaacae8ccbc790ea31aaa27f37
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 688791f03d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Newest version is 4.4 so update it in the git as well
Task-number: QTBUG-98971
Change-Id: I3b2086857e7c9b9cf7d44a40c080ae6bd03ca927
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7017b2f1f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
QtPDF does not support static builds, but the build still passes
ok in bitbake builds. Use force when removing the files, since they
don't exists in static builds.
Change-Id: I50cce6e277c25c32aa98804d5f3de6d25df12b25
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit e6fda09a6f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
In static builds, we can't have the extra simulation and refapi packages
first on the list, since the static libs would end up there as well.
Use PACKAGE_BEFORE_PN to add the packages in proper order.
Change-Id: I35976b90b12137caa7b7044f4aef40c229c75783
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 7e1e9f892e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
