Qt sources were changed to use SPDX license identifiers, update
LICENSE strings to match the used identifiers. At this time,
qtbase and qttools were converted, rest of the modules will follow.
Change-Id: Ic0a43438f2bdcc82941aed34a3e034bb3c6db67a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Building Qt modules uses extra CMake instructions that try to be clever
about which CMAKE_PREFIX_PATH to use. With SDK, these instructions end
up using the SDK host paths in the device instead of the actual device
paths. Add CMake option to prevent Qt from changing the default prefix.
Fixes: QTBUG-103577
Pick-to: 6.3 6.2
Change-Id: Ia933c843d811e6adb2ed4ede4708f55a6f0e8f0c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING has been deprecated in 6.4,
and cross-compiling compile time tools from sdk doesn't make
sense, all runtime tools are still being compiled.
Pick-to: 6.3 6.2
Change-Id: Ia35255e3b84c38342be58b11461a4ee908fba1f9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Developer_build will include all tests, including private tests,
enabling verification of Qt functionality on target platform.
Pick-to: 6.3 6.2
Change-Id: Icd477958fc7e8144194c5cae3f5b94eebfee6045
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Make sure the qt-cmake* helper scripts get correctly created
for mingw toolchains.
Pick-to: 6.3 6.2
Change-Id: I0ec6c4e12abf375677226ea32a6c36066a990f3b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
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.
Pick-to: 6.3 6.2
Change-Id: I33a9b0f3915417d98ad12559ce7661c92b1cc739
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
* openembedded-core/scripts/contrib/convert-spdx-licenses.py .
...
All files processed with version 0.01
Pick-to: 6.3 6.2
Change-Id: Ife671a597eea9e1567d2b37d0aea25cc0b8e9012
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
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>
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>
This reverts commit 68bd9cee63.
Proper fix has been merged to qtbase.
Change-Id: I394bc594d2b4d9b90b98f530d65703b4352afa29
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 85e55e5629)
Reviewed-by: Mikko Gronoff <mikko.gronoff@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)
All references here to BSD actually mean BSD-3-Clause.
Pick-to: 6.3 6.2
Change-Id: Iec43070c5245d053259c215311f238989741c85d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
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>
MinGW runtime libs are missing symbols used in RHI Direct3D.
Include patch until it's merged in qtbase to fix the nativesdk-qtbase
build.
Pick-to: 6.3
Task-number: QTBUG-100294
Change-Id: I314eb74d52cf28e48ef65fea263d85f2a7978a55
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
qt-cmake* helper build scripts by default use Qt's generated
qt.toolchain.cmake as the CMAKE_TOOLCHAIN_FILE. Keep this behavior and
patch qt.toolchain.cmake so that will chain-load our Qt6Toolchain.cmake.
qt.toolchain.cmake includes bits that are needed for the conan
integration to work correctly with the sdk.
Pick-to: 6.3 6.2
Change-Id: I89a5e152324178151ba8a5ab4734d542fa4c995c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
With latest submodule update, several modules
got licenses removed and/or added & updated.
Update LIC_FILES_CHKSUM field in recipes to
match the updates.
Change-Id: Ic0c7c65c92bf515dbf510f5c988f92446bf76dc2
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
QtBase has several helper scripts available that can be used
to build other modules and tests. Patch those so they work
properly from the sdk.
Fixes: QTBUG-93342
Pick-to: 6.3 6.2
Change-Id: If393d1a0abdebe21a70439190e49715bcd3e35a1
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Even if eglfs or linuxfb could be enabled via QT_QPA_DEFAULT_PLATFORM
variable, options have been missing. So add those missing options.
Add eglfs/linuxfb option based on opengl feature into
PACKAGECONFIG_GRAPHICS packageoption.
Pick-to: 6.3 6.2
Change-Id: Ida85363ebcf4ef47a4914dcaf5d2649bb70c41fc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This a workaround for Dunfell, where native packages are still
cleared which means that qtbase-native cannot have runtime dependency
to libssl as the package does not exist.
Fixes:
ERROR: Required build target 'qtbase-native' has no buildable providers.
Missing or unbuildable dependency chain was: ['qtbase-native', 'libssl-native']
Pick-to: 6.2
Change-Id: Idad2a85b3a84275e5824545e22d425b578d1d647
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
* fails in do_install_ptest_base when ptest is in DISTRO_FEATURES
Pick-to: 6.2
Change-Id: I89778b3b53594a2ca46a088775689251e82dc8aa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This reverts commit fc83f6dfbd.
No need to disable all tests, next commit adds a work around
fix for Catch2.
Change-Id: Ic0e1a7cb085ca54edecc690c40d9adb82f952678
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Newer oe-core doesn't pull many default dependencies anymore:
https://lists.openembedded.org/g/openembedded-core/message/156185
add explicit dependency on pkgconfig through webos_pkgconfig.bbclass as
we're using it here.
Fixes:
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE)
...
ERROR: Feature "zstd": Forcing to "ON" breaks its condition:
ERROR: Feature "libudev": Forcing to "ON" breaks its condition:
Pick-to: 6.2
Change-Id: I0705e15d57f30b5aeb908631d269db3dfd3413f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Some of the tests fail with gold linker.
error: unexpected reloc 3 against global symbol qt_version_tag without base register in object file when generating a position-independent output file
collect2: error: ld returned 1 exit status
Cherry-pick updated with more tests for dev.
Change-Id: I223e34fb9ecba01a8f3df5123eed6705d93ceed8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit f45f237084)
Move all the module SRCREV into qt6-git.inc file using the same format,
where repository name is used for the postfix. Changes to the module SRCREVs
are mostly done by updating all the modules at once, usually either with
a separate update script, srcrev_update bbclass or by external update bot.
This change should make the update process more easily automated.
Update the srcrev_update bbclass to handle updates in qt6-git.inc in addition
to recipe files, with and without the repository name postfix.
Pick-to: 6.2
Change-Id: I711e7867dba3b066d363ca40f78e7b4aa740a69c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Latest revisions from dev.
Change-Id: Ia9b1bed92a4d6d5ffad5293bece76278e9d14a8c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Required by QtApplicationManager to build appman-packager binary
for host.
Change-Id: Ia31e2df611fe4876110ba9999dd4f60374b783b1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
The selftest fails with GCC 11
Task-number: QTBUG-95842
Change-Id: I021297f3e0a95c08c03c1e19460de2969d88532e
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
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>
Latest from dev branch.
Disable rpaths from ptest to fix QA Issue: package contains bad RPATH.
Change-Id: I3f29de8a9200657d9ac2eb87d4288fde09b49469
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
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>
Update to latest content in dev branch.
- Assimp submodule in qt3d & qtquick3d recipes changed to
correct "qt6_assimp" branch as it now contains needed
fixes.
- Qtquick3d patch removed, available upstream
Change-Id: I9d99e14595502d9df0078e7e3f9d876f1c46da0c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Build tests for ptest in Qt modules. The default build using
PACKAGECONFIG[tests] doesn't work as the installation of tests is
not working correctly. Instead build the tests separately after
the module has been built and installed.
The tests have dependencies to the data and source files which
need to be packaged with the test binaries.
Change-Id: Ibae55a29135267ce96949aa0c15ad7e236ef2512
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Configure Qt always to use bdf linker instead of gold linker, which
has issues with some of code in Qt:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842304
Change-Id: I743e4b4ed882f936af47a7f5a3b13f24b0635426
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Some of the tools were moved to libexec, package all of those
into the tools package.
Pick-to: 6.1
Change-Id: Ib8d3dbe1821591101febf0ecedc526edc9b56366
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Latest from dev branches.
Assimp is used from upstream/master branch which contains
fix for missing exception header.
Change-Id: I21ef3f62caed80391fbaa301bf972e659a6fa6fc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Latest from dev branches.
Change-Id: Iceda025a694ba3b179ce9881b194c47d43a1f529
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Be consistend about BBCLASSEXTENDS, there is no need to append them.
Change-Id: I3b5838b23a6141b96fe7bdb128071335ec27a315
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
