* fixes QA:
qtcharts-5.6.99+5.7.0-beta+gitAUTOINC+8a78184181: qtcharts-examples rdepends on qtmultimedia, but it isn't a build dependency, missing qtmultimedia in DEPENDS or PACKAGECONFIG? [build-deps]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The license has extra blank lines at the end so these are removed to
match LICENSE.PREVIEW.COMMERCIAL from upstream.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Using the prepend function instead of "=+" makes sure the variables
are set even if the user overrides EXTRA_OECMAKE with "=" instead of just
appending to it.
Prepending also allows overriding because later arguments take precedence
ever earlier ones in CMake.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Currently if a project if using the cmake bbclass and the CMakeLists.txt file
uses find_package to find Qt5 and error like this is produced:
| The imported target "Qt5::Core" references the file
|
| "/qmake"
|
| but this file does not exist. Possible reasons include:
This is because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only set in the cmake_qt5 bblcass.
To make it work better in that case the Qt5Config files check if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
is defined and bail out if not. For CMake this is the same as Qt5 wasn't found.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Qt releases are done from a release branch (5.x.x), which is later merged
back to a stable branch (5.x) and then removed. When a recipe is updated
to use the released SHA from the release branch, it will eventually break
when the release branch is removed. This happens because bitbake tries to
validate that given SHA is found from the given branch. Add additional
variable that can be used to disable the SHA check when branch is known
to be later removed, but SHA remains valid.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* fixes following QA:
WARNING: qtwebkit-5.6.99+5.7.0-alpha+gitAUTOINC+e9b369b16f-r0 do_package_qa: QA Issue: qtwebkit rdepends on libxcomposite, but it isn't a build dependency? [build-deps]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* xvideo and xinerama were removed in:
commit e824abd987d77efaa085fe1f9fb514d270798d55
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Tue Oct 13 18:43:25 2015 +0300
configure: Remove unused options -xvideo and -xinerama
-xvideo was not used even by Qt 4 for a long time.
-xinerama was used by the xlib plugin which was dropped
by e6a7a6a381c0b61a93a642b425ecbcd714fd1c29.
* xinput was removed in:
commit fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Thu Oct 8 18:19:39 2015 +0300
configure: Remove -xinput option
It's obsolete since e6a7a6a381c0b61a93a642b425ecbcd714fd1c29
(Remove xlib plugin) and a2337f79ffd229aa1e91f6bfec6294570eb3fe44
(Remove Windows and X11 from src/widgets/platforms).
The actual option is -xinput2.
* gtkstyle was removed (partially replaced with gtk) in:
commit 899a815414e95da8d9429a4a4f4d7094e49cfc55
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Thu Jul 30 21:32:43 2015 +0300
Remove gtk2 style from qtbase, it will be moved to qtstyleplugins
This will allow us to drop gtk2 support from qtbase in future,
while still providing the gtk2 style for those who want to use it.
Also with moving to qtstyleplugins, the code can be simplified
because we can directly link to libraries we need, instead of using
QLibrary.
[ChangeLog][QtWidgets] Remove QGtkStyle, it is now provided in
qtstyleplugins repository.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
to find out how you're affected check which files/tools are
included in your builds, e.g. for qtwebengine:
OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
67 ** $QT_BEGIN_LICENSE:BSD$
17 ** $QT_BEGIN_LICENSE:FDL$
61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
QtQuickControls2 has deeper folder structure, make sure that files
go to correct packages.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquick1: LICENSE.LGPLv3: I checked git repository.
To be honest: I have no idea what caused checksum change.
JaMa: it was modified in this change:
OE @ ~/projects/qt-project/qtquick1 $ git log --oneline 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141..dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 -- LICENSE.LGPLv3
cd50897 Add the GPLv3 license text
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 8fbb743..4d67bac 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -5,6 +5,8 @@
You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU Lesser General Public License version 3, which is displayed below.
+ This license makes reference to the version 3 of the GNU General
+ Public License, which you can find in the LICENSE.GPLv3 file.
* in some cases this is actually older SRCREV than what was
used before (because normally the recipes use latest revision
in stable - e.g. 5.6 branches, not the actuall tags). I'll
upgrade to latest 5.6 revisions in follow-up commit (together
with refreshing the .patch files and github.com/meta-qt5/qt*
repositories to apply cleanly)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
git/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp:180:14: error: 'QCoreApplication' has not been declared
if (!QCoreApplication::arguments().contains(QStringLiteral("--no_render_alpha")))
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* this requires latest oe-core (Yocto 2.1), if you want to use latest
meta-qt5 with older oe-core, you need to backport this bbclass
and more importantly don't forget to provide
EXTRA_CONF_PACKAGECONFIG
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Since we just added lib/ containing python modules, we should really
ignore any compiled python objects since they will be produced if the
code is executed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* without readline in PACKAGECONFIG and with no-static-libraries.inc
gdb fails when trying to build against own bundled static readline
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The package no longer fails sanity test because of connman-qt5.pc
containing references to build host paths.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The replacements were being done in qt_module.prf which is not included
when building 3rd party libraries. To resolve this, move the
replacements from qt_module.prf to qt.prf which is included when
building any qmake project. The pkgconfig include replacement is removed
as it doesn't seem to be needed anymore and causes issues when the
includedir path in pkgconfig has part of its path replaced with
${includedir} resulting in a circular reference that causes the OE
package_do_pkgconfig task to fail.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When qtbase is configured with xkbcommon-evdev (usually without X),
make sure xkeyboard-config is installed to provide keymap database.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Having in recent OE-Core master added build system extension
capabilities to recipetool, add a module in meta-qt5 which uses this to
enable extraction of Qt5 dependencies from cmake, qmake and autoconf
files. It's by no means perfect but does do something useful if you add
a recipe for a Qt5-using piece of software using recipetool create or
devtool add.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Remove direct dependency to nativesdk-dbus. Instead configure
qtbase to use runtime linked dbus library, if that is found.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* fixes QA warning:
WARNING: qttranslations-5.5.99+5.6.0-rc+gitAUTOINC+ce85e4ee4e-r0 do_package: QA Issue: qttranslations: Files/directories were installed but not shipped in any
package:
/usr/share/qt5/translations/qtquickcontrols2_uk.qm
/usr/share/qt5/translations/qtwebengine_de.qm
/usr/share/qt5/translations/qtwebengine_ru.qm
/usr/share/qt5/translations/qtwebengine_uk.qm
/usr/share/qt5/translations/qtwebengine_en.qm
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
qttranslations: 5 installed and not shipped files. [installed-vs-shipped]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* drop section with list of static libraries in workdir
* feel free to fix it properly in Qt build, I need quick hack to unblock
my bitbake world builds
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* there are multiple -L paths to workdir, causing QA warning like this:
ERROR: qtwebkit-5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0 do_populate_sysroot: QA Issue: Qt5WebKit.pc failed sanity test
(tmpdir) in path qtwebkit/5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0/sysroot-destdir//usr/lib/pkgconfig [pkgconfig]
* qtwebkit is dead, so hack it with simple sed, feel free to fix it in
mkspecs if you want
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* WARNING: QA Issue:
/usr/lib/qt5/mkspecs/features/data/mac/objc@underscore@namespace.sh_qtbase-mkspecs
contained in package qtbase-mkspecs requires /bin/bash, but no
providers found in its RDEPENDS [file-rdeps]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* otherwise all builds fail with:
ERROR: QA Issue: Qt5Core.pc failed sanity test (tmpdir) in path qtbase/5.5.99+5.6.0-alpha1+gitAUTOINC+f7f4dde80e-r0/sysroot-destdir//usr/lib/pkgconfig [pkgconfig]
since oe-core insane.bbclass was fixed to properly search for tmpdir
in all pkg-config files.
* this issue was there for long time, I've checked the build with jethro
branch and it already has
prefix=<TOPDIR>/tmp-glibc/sysroots/qemux86/usr
it just wasn't detected by QA checks until now
* they reference workdir and trip sanity check:
ERROR: QA Issue: libQt5Sql.la failed sanity test (workdir) in path qtbase/5.5.99+5.6.0-alpha1+gitAUTOINC+f7f4dde80e-r0/sysroot-destdir//usr/lib [la]
* I'm intentionally not using remove-libtool.bbclass recently
added to oe-core, because many people combine newer meta-qt5
with older oe-core and can be missing this bbclass, I've
pending patch to migrate this to remove-libtool.bbclass, will
probably merge it after 2.1 or 2.2 release.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Add dependency to qtdeclarative to qttools' native and nativesdk builds.
This gives us lupdate with a support for Qml files. The nativesdk builds
of qtdeclarative depend on more modules (Xml, Sql) from nativesdk-qtbase,
so preserve all libs that are already built. This brings few extra libs
to the package that might not be needed, but keeps the recipe simpler.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
