Qt Purchasing was introduced as a new module in Qt 5.7. It was previously
only available with Qt's commercial license. It can be used to build payment
features.
The commit hash in the recipe is the latest in the 5.10 branch. Licenses
were combed with licensecheck tool.
Signed-off-by: Timo Jyrinki <timo.jyrinki@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apply:
0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
also for nativesdk-qtbase as the comment says
* drop unused:
0001-Add-missing-include-for-struct-timeval.patch
which wasn't removed in 5.10.1 upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The '-optimize-size' option would enable the compiler to optimize
for size instead of speed. If the global compiler option already
included '-Os', this option would be enabled by default.
It would affect the whole Qt libraries and Qt applications as well.
This feature is available in Qt 5.9+.
Signed-off-by: Kwangsub Kim <kwangsub.kim@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Updated Qt modules to 5.10.1.
New recipe qtknx added.
Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Current implementation was causing build issues as it cluttered source
directories and modified recipe sysroot content. Tests are now build
in the separate build directory ${B} where we don't need to worry about
moving files to the recipe sysroot, and if tests are enabled in
PACKAGECONFIG, they have been already built during do_compile task.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Qt switched to pcre2 for 5.9. The configure switch has not been renamed.
We just need to update the build dependency.
This requires the poky commit:
0204af2 libpcre2: add packages for 16-bit and 32-bit code unit support
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
QtWebEngine uses bison during the build. While normally bison-native gets
staged into sysroot indirectly by the toolchain via binutils-cross, it's
better to have the dependency listed explicitly for deterministic builds.
Otherwise, when using an external toolchain, it fails like this:
| FAILED: gen/blink/core/XPathGrammar.cpp gen/blink/core/XPathGrammar.h
| .../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/bin/python-native/python2
| ../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rule_bison.py
| ../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/XPathGrammar.y gen/blink/core bison
| Traceback (most recent call last):
| File "../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rule_bison.py", line 83, in <module>
| returnCode = subprocess.call([bisonExe, '-d', '-p', prefix, inputFile, '-o', outputCpp])
| File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 168, in call
| return Popen(*popenargs, **kwargs).wait()
| File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 390, in __init__
| errread, errwrite)
| File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 1024, in _execute_child
| raise child_exception
| OSError: [Errno 2] No such file or directory
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
A flaw was introduced by commit b8a236df:
[ qt5: Fix cmake config files ]
Removing ${S}/include must be done before configure script being
called, but it's not in that case for qtbase-native recipe after
the commit, that is saying, ${S}/include was removed after configure
being called, which causes compiling issues for native build.
Further more, the logic introduced by commit b8a236df should only apply
to qtbase recipes, so they should be moved to qtbase recipes as well.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
QT_EDITION defaults to 'opensource', but the end users could override
it with 'commercial' if they want.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This package is no longer created, it was also removed when moving to qt 5.8
with commit 333949a823 from
packagegroup-qt5-toolchain-target.bb.
As the packagegroup was added for a target providing cross-debugging services
for qtcreator (commit 53242713da) and maybe the
package parent qtdeclarative is still needed, add that one instead.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The build-in qmake settings point to the sysroots on the host machine.
Running qmake on the target hence errors with:
Could not find qmake configuration file linux-oe-g++.
Error processing project file
So add qt.conf to the target image with the correct locations.
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
While most mkspecs use hardcoded compiler names / options, qmake in
meta-qt5 is setup to get them from the environment. While this works
fine with openembedded, it does break normal workflows outside of it.
For example to get the SDK working with Qt Creator either the environmental
script most be sourced first, making it impossible to switch between
different Qt versions or the OE_QMAKE must be set for every project,
otherwise you get cryptic errors like 'make: c: Command not found',
since the compiler name is not set and hence an attempt is made to
execute only the arguments.
Likewise on the target itself, qmake doesn't work without first setting
the OE_QMAKE variables.
This patch adds default toolchains options, so it is no longer required
to set them, but keeps the flexibility to alter them from the environment.
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This was never defined for nativesdk, which then broke sdk which
had nativesdk-qtwayland included. Rather than add it there, remove
its use everywhere, since it was not adding anything meaningful to
the build.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The expansion is now again optional, but for brief time
it was required. Add the default value (True) so that
the layer can be used also with older oe-core versions.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Previous patch was removed, but PACKAGECONFIG was not changed
to match the new feature flag.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Different HostPrefix was used when building Qt and in external
SDK's qt.conf. This caused e.g., wrong path in qmodule.pri for
PKG_CONFIG_EXECUTABLE.
Task-number: QTBUG-63097
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Using Qt based SDK for stripping ARM binaries results in errors.
Generated Makefile contains:
STRIP = \$(OE_QMAKE_STRIP)
but due to the missing export of OE_QMAKE_STRIP variable STRIP will be unset and
no strip will be perfomed:
install -m 755 -p lib/libSigUdev.so.1.0.0 /opt/poky/2.2.1/sysroots/cortexa9hf-neon-poky-linux-gnueabi/usr/lib/libSigUdev.so.1.0.0
strip-unneeded /opt/poky/2.2.1/sysroots/cortexa9hf-neon-poky-linux-gnueabi/usr/lib/libSigUdev.so.1.0.0
make: strip-unneeded: Command not found
Makefile:576: recipe for target 'install_target' failed
make: [install_target] Error 127 (ignored)
adding OE_QMAKE_STRIP=$STRIP to generated qt5.sh solve the issue.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
ptest.bbclass provides a set of standard do_*_ptest_base tasks. Each of
them calls a corresponding regular do_*_ptest task, that components are
supposed to override for own implementation. When PTEST_ENABLED is not
set, an anonymous python function removes all do_*_ptest_base tasks from
the queue. qt5-ptest.inc adds a special case for do_populate_sysroot and
re-arranges the order or ptest tasks due to that. But, unfortunately,
do_install_ptest was added directly, not do_install_ptest_base, hence when
"ptest" is disabled and all other do_*_ptest_base tasks are removed, this
one do_install_ptest task is left w/o dependencies and gets scheduled for
execution very early on, even before pseudo-native gets built and stages
"fakeroot" functionality. The fix is to add do_install_ptest_base task,
which calls do_install_ptest only when "ptest" is enabled.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
A useless file was added mistakenly by commit ec80b092:
[ qtbase: Add OE clang specific mkspecs ]
Drop it.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
If we specify neither -system-pcre nor -qt-pcre then qtbase will first see
if it can find the pcre library in the system and fall back to compiling
its own if that's not possible.
Unfortunately, this means that if qtbase-native happens to be built on a
machine with system pcre available then the resulting binaries such as
bin/qt5/uic in sstate files won't work correctly on machines that don't
have pcre available. Even ignoring that, it doesn't help for packages to
build differently depending on how the build system is configured.
We could depend on pcre-native and pass -system-pcre, but this doesn't work
by default because qtbase actually requires pcre16 which is an optional
(via PACKAGECONFIG) feature of pcre so the default there would need to be
changed too.
So, let's make qtbase-native match the default of qtbase by passing
-qt-pcre in order to ensure that qtbase-native is always built with its
own pcre implementation.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Since update to 5.9.2 native recipes in meta-qt5-extra fail due to strange path
to mkspecs. This patch fixes this the hard way.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
We can not piggy back clang anymore on existing
OE mkspecs since starting 5.9 the configure is
asking compiler for include paths and it needs to
know if platform is clang-linux or g++-linux
Fixes:
ERROR: failed to parse default search paths from compiler output
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
files are maintained, include branch and tag name so that it's more
clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbasehttps://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta/conf/distro/include/security_flags.inc adds -Wformat and
-Wformat-security, but openh264 adds -Wno-format after that causing
build to fail
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This file lists the licenses in use by OE-Core and it not a
proper license file, just use the COPYING.MIT.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
With
commit efa8aaf82e
Author: Andreas Müller <schnitzeltony@googlemail.com>
Date: Thu Feb 9 00:26:09 2017
qmake5_base.bbclass: set qt.conf by environment variable again
we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and
instead directed it to a path which was intended not to exist.
The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase
to build again after Qt 5.8 started paying attention to the
contents of this file.
The change as done in efa8aaf works well enough for Morty and
subsequent releases' copies of Bitbake, but fails on earlier
releases because they lack the following change:
commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0
Author: Ross Burton <ross.burton@intel.com>
Date: 2016-07-14 13:56:22
bitbake: build: don't use $B as the default cwd for functions
The result is that when we build with Krogoth or prior, the body
of do_generate_qt_config_file() runs with a cwd of ${B}, which was
_not_ the intent of efa8aaf. Because the working directory is ${B},
${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() --
whose cwd is by design also ${B} -- then finds the file 'foodummy',
and the build breaks for the reasons outlined in efa8aaf.
This change simply shifts the implementation tactics to suppress
the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely
on unspecified behavior about the cwd of do_generate_qt_config_file().
(cherry picked from commit a17ff281aa8d99f770b0a049cb798235005fb93e
at https://codereview.qt-project.org/yocto/meta-qt5.)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
