Mirror of https://code.qt.io/cgit/yocto/meta-qt5.git https://git.enea.com/cgit/linux/meta-qt5.git/atom?h=dev 2016-10-27T12:46:53+00:00 2016-10-27T12:46:53+00:00 Samuli Piippo samuli.piippo@qt.io 2016-10-20T11:22:57+00:00 urn:sha1:f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6 Add more PACKAGECONFIGs for qtbase. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk). Previous workaround removed and new ones added for: QTBUG-56656, QTBUG-56666 Reduce number of patches applied to qtbase. Change-Id: I6b82fd46aaade4f14cf61e29adb7fc984070333b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> 2016-09-30T09:03:09+00:00 Samuli Piippo samuli.piippo@qt.io 2016-09-07T07:06:40+00:00 urn:sha1:9195d9dc805fd3132023ff33bc77ace1f3f7e40f The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Change-Id: I4c937c1acb3d204ac4560090cab3d0fc7e0e815a Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> 2016-08-23T13:37:11+00:00 Samuli Piippo samuli.piippo@qt.io 2016-08-23T10:28:36+00:00 urn:sha1:7a2707393eccad021763cd9a4294e471883b8590 * meta-qt5/master: qtbase: fix drm dependency for eglfs PACKAGECONFIG qt5: upgrade to latest revisions in 5.7 branch qt5-opengles2-test: remove cmake_qt5.bbclass: when using _prepend don't forget to add space at the end qtquick1: fix qtwebkit support qtbase: add PACKAGECONFIG for journald logging qtserialbus: add recipe qtwayland: Rework recipe to allow PACKAGECONFIG use qtwayland: add dependency on libxcomposite qtcharts: Add dependency on qtmultimedia packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS. Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458 2016-08-05T09:03:12+00:00 Martin Jansa Martin.Jansa@gmail.com 2016-07-27T15:25:07+00:00 urn:sha1:1a42aa78af040d0fbecc960e4f9dd3f180ccb404 * LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2016-05-19T13:08:51+00:00 Samuli Piippo samuli.piippo@qt.io 2016-05-13T10:51:43+00:00 urn:sha1:6bd7ab491793d92f0942d9d8726873a514302849 Change PV to 5.7.0 Change-Id: I525ba69fe3e0f881eee52f7ab56071d555dd8b89 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com> Reviewed-by: Antti Kokko <antti.kokko@qt.io> 2016-05-09T13:12:26+00:00 Samuli Piippo samuli.piippo@qt.io 2016-05-09T11:15:18+00:00 urn:sha1:5bd17acd072dd168bf1ecadde9cd2b9641c08c6c * meta-qt5/master: qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig qtbase: remove fonts packages qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle qt5: upgrade to latest revisions in 5.7 branches qt5: add one more subfolder for ${PN}-qmldesigner replace base_contains by bb.utils.contains qt5: upgrade to latest revision in 5.6 branch qt5: set SRCREVs,PVs to 5.6.0 qtquickcontrols: fix compilation of examples/texteditor qtdeclarative: fix compilation of examples/qquickviewcomparison quazip: update to 0.7.2 qtquickcontrols2: initial add 5.6.0 qmake5_base: use remove-libtool bbclass recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF qtwebengine: enable ARMv7VE support Add .gitignore to ignore .pyc/.pyo files Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch recipes-qt/qt5/qtbase/0009-Always-build-uic.patch recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ifab26e8f8a0c8cb8af94509f657161de09c182d7 2016-05-02T13:16:18+00:00 Martin Jansa Martin.Jansa@gmail.com 2016-02-14T17:37:41+00:00 urn:sha1:bf2cafa909a27250f853a823e9d7101307337e7a * 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> 2016-04-21T19:36:18+00:00 Martin Jansa Martin.Jansa@gmail.com 2016-04-20T09:38:06+00:00 urn:sha1:754aaadc7f0a1c98a4895899617afbaef0f1cdfa * 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> 2016-04-20T08:58:33+00:00 Andreas Müller schnitzeltony@googlemail.com 2016-04-01T20:07:56+00:00 urn:sha1:f636eb7444a3454f2a25275a07e414d7409734d7 * 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> 2016-04-13T08:19:06+00:00 Samuli Piippo samuli.piippo@theqtcompany.com 2016-04-08T11:50:02+00:00 urn:sha1:e6897ccd0eec8fb5229e0fdd8f354292e0f49a16 Change-Id: I0d5b877609f761c8bcca90c118cceb15d61a3dcc Reviewed-by: David Schulz <david.schulz@theqtcompany.com>