The do_generate_qt_environment_file task wasn't running in the fakeroot
environment so qt5.sh was not owned by root:root but the user running
the builds.
Fixes host-user-contaminated QA warning.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
fixes:
| In file included from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/X11/Xlib.h:44:0,
| from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglvivante.h:244,
| from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglplatform.h:38,
| from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/egl.h:39,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen_p.h:52,
| from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen.cpp:34:
| ../../include/QtCore/../../../git/src/corelib/io/qurl.h:131:9: error: expected identifier before numeric constant
| None = 0x0,
| ^
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
files for Qt Quick Designer integration, which are not needed in the image.
Create new ${PN}-qmldesigner package that includes those files instead of
${PN}-qmlplugins.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Modify qtwebkit recipe so that it removes the conflicting {PN}-examples*
packages, instead of redefining all packages again.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When `QT_DIR_NAME` is defined as an empty string (default is "qt5"),
package.bbclass will throw lots of QA warnings because now the paths contain
double slashes ("//").
We can address these warnings by explicitly defining a slash in the
variable itself.
Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When QT_DIR_NAME is altered, /usr/bin` is checked. This directory
is more often than not already created. Hence `mkdir` with `-p` should
be used. Currently it results in a build failure since the directory
already exists.
Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
QT_MODULE is only used in conjunction with qt5-git.inc.
It feels more consistent to have the variable in the context of the file
where it is used instead of having it in a separate file.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Add missing HostData and HostLibraries paths to qt.conf for qmake.
Using the target sysroot for the HostData, allows us to remove the
symbolic link for the mkspecs.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Split the populate_sdk_qt5 bbclass into two parts, where the generation
of qt.conf is moved to a new base bbclass. It is reusable in toolchain
meta recipes that use different tasks than meta-toolchain-qt5.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* netdb.h staged by glibc-2.22 recipe defines struct addrinfo inside
__USE_XOPEN2K unlike other versions which are using __USE_POSIX
* fixes:
| ../../../src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c: In function 'bio_ip_and_port_to_socket_and_addr':
| ../../../src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c:40:19: error: storage size of 'hint' isn't known
| struct addrinfo hint, *result, *cur;
| ^
| ../../../src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c:58:36: error: dereferencing pointer to incomplete type
| for (cur = result; cur; cur = cur->ai_next) {
| ^
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qmake5_paths.bbclass refers to QMAKE_MKSPEC_PATH_TARGET which is not
defined when inheriting qmake5_paths directly instead of qmake5_base.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fixes the following warning:
WARNING: QA Issue: qttranslations: Files/directories were installed but not shipped in any package:
/usr/share/qt5/translations/qtwebsockets_fr.qm
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped]
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt3d is not a technical preview anymore since 5.5
* Take the opportunity to update TPLA license, using
LICENSE.PREVIEW.COMMERCIAL file from qtbase
Signed-off-by: Julien Brianceau <jbriance@cisco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
In recent commit c0cc4ff882
it was changed to replace STAGING_DIR_NATIVE and STAGING_DIR_HOST with
qmake variables, however there is a little difference between them and
they are not one to one mapped, OE sysroot variable does not contain
prefix (/usr) at the end but QT_INSTALL_PREFIX and QT_HOST_PREFIX does,
so we need to take care of substituting the full string, so qmake can
formulate the header and library search paths correctly. It fixes the
issue where qmake started to have wrong search paths with duplicated
<sysroot>/usr/usr/include/... added to compiler commandline and which
meant that compiler did not find the headers in sysroot while building
components like qtwebkit
* replace ${STAGING_DIR_HOST} instead of ${STAGING_EXECPREFIXDIR}
Replacing ${STAGING_EXECPREFIXDIR} with the $$[QT_INSTALL_PREFIX] qmake
built-in variable only covers ${STAGING_DIR_HOST}/usr and misses the
following additional host paths:
${STAGING_DIR_HOST}/lib
${STAGING_DIR_HOST}
Replace ${STAGING_DIR_HOST} instead with $$[QT_SYSROOT] so that sed
replaces all the host paths contained in qconfig.pri instead of only
some of them. This avoids host paths being referenced on the SDK host
when using the Qt SDK.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Since 5.5, Qt modules (except qtimageformats) have moved from "Digia"
to "The Qt Company" in their LGPL_Exception file
* qtwebkit-examples doesn't include a LGPL Exception file, so remove
it from LICENSE list
Signed-off-by: Julien Brianceau <jbriance@cisco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
With 5.5, the array of paths got split into at least 3 separate variables,
but only one of them was increased. Similarly, increase the other 2.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
On RaspberryPi, the EGL include paths were not included in the generated
ninja build files, because the pro files were run in wrong order. Fix the
order, but remove compiler overrides, as they would break the build again.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Instead of separate recipes for target, native and nativesdk, use
one recipe with BBCLASSEXTEND in place.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Change qmake.bbclass to support building native and nativesdk packages,
so that qmake or qt5-module can be inherited and BBCLASSEXTEND used to
create native and nativesdk packages.
qtxmlpatterns and qtdeclarative native and nativesdk modules are required
for Qt Quick Compiler.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Make it simpler to add Qt modules to image and toolchain, without need
to specify each subpackage separately. All Qt modules should provide
the ${PN} package, so create it even if empty. Make the ${PN} package
also recommend all subpackages that are normally required at run time,
namely plugins. Do the same for ${PN}-dev and ${PN}-dbg packages.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Third-party libs e.g. libqtfreetype when built is not packaged and hence
goes missing in sysroot, then rest of qt components like qtwayland gets
its configuration from qtbase to enable it but then does not find the
internal version of libqtfreetype.a which is what qtbase directs it to
use and as a result it starts throwing linking errors e.g.
x86_64-angstrom-linux-ld.gold: error: cannot find -lqtfreetype
This patch installs the needed libs into dev packages
Remove a trailing whitespace as well while at it.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Tested-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This helps in load balancing code.qt.io may be overloaded
and bails out occasionally when doing fresh clones
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This patch is a backport from upstream qt5 fixes building with clang
from meta-clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This avoids qconfig.pri in the Qt SDK incorrectly including paths from
the build host that may not exist on the SDK host. As the paths are
now correct, qmake can correctly detect system include paths and use
-isystem instead of -I for Qt's include directories which allows the
suppression of warnings from library headers when building Qt
applications.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Set paths correctly in qt.conf so that $$[QT_SYSROOT] and
$$[QT_INSTALL_PREFIX] can be used from qmake.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Sometimes, when ${OE_QMAKE_PATH_LIBS} is empty, "cp -a" ends up copying
font files there w/o preserving "fonts" directory, failing the following
chown command.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
fixes:
| Qt Warning: Could not find a location of the system's Compose files. Consider setting the QTCOMPOSE environment variable
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
upstream configure parameter added in some previous version, but I've
failed, so now good-old -external-hostbindir parameter is back
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The qtwebkit configure test never succeeds in finding system leveldb
(ie qtwebkit internal copy of leveldb is always used) so leveldb is a
false dependency.
This change allows qtwebkit to be built in a disto which enables
security_flags.inc (it's otherwise blocked since the leveldb recipe
fails to build when security_flags.inc is used).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
