Mirror of https://code.qt.io/cgit/yocto/meta-qt5.git https://git.enea.com/cgit/linux/meta-qt5.git/atom?h=5.6 2017-06-07T05:46:21+00:00 2017-06-07T05:46:21+00:00 Mikko Gronoff mikko.gronoff@qt.io 2017-06-06T10:15:13+00:00 urn:sha1:dc32862fb82686c30722970619ad1187695e6e60 * upstream/krogoth: qtwebkit: depends on gperf-native cmake_qt5.bbclass: add qtbase-native to DEPENDS Update Qt5's git repositories to match new locations qtwebengine: Add gperf-native to DEPENDS qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled. qt5: update submodules qtbase: avoid qmake errors due to missing oe-device-extra.pri qtdeclarative: add upstream patch to fix QtQml crash with GCC 6 Conflicts: recipes-qt/qt5/qtbase_git.bb Change-Id: Ic773b1eaa0d5c84316352ae41d7ec5cd2d5c8048 2017-02-20T13:40:16+00:00 Anders Darander anders@chargestorm.se 2017-01-25T12:26:13+00:00 urn:sha1:ac0d613302db8f7f013bbb0c72b30cdea4bb72c3 When building with recipe-specific-sysroot's, qmake can't be found: | CMake Error at WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:32 (message): | The imported target Qt5::Core references the file | | WORKDIR/recipe-sysroot-native/usr/bin/qt5/qmake | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained | | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake | | but not all the files it references. | | Call Stack (most recent call first): | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists) | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:163 (include) | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:31 (find_package) | CMakeLists.txt:56 (find_package) | This is solved by adding qtbase-native to the exported DEPENDS. Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2016-08-19T08:17:41+00:00 Samuli Piippo samuli.piippo@qt.io 2016-08-18T13:43:50+00:00 urn:sha1:c433b617de5e5363b252a80240f053b103e35e01 * meta-qt5/krogoth: qtquick1: fix qtwebkit support qtbase: fix drm dependency for eglfs PACKAGECONFIG cmake_qt5.bbclass: when using _prepend don't forget to add space at the end qt5: upgrade to latest revisions in 5.6 branch qtbase: add patch to make Qt5Config modules behave better with cmake builds cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE Change dependency from virtual/mesa to drm in the kms packageconfig. replace base_contains by bb.utils.contains Conflicts: 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/0011-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_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtgraphicaleffects_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/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch recipes-qt/qt5/qtquickcontrols2_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_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/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I1da3a7689e16e5ffaa6e31030729a4f2f29c501d 2016-08-05T09:12:12+00:00 Denys Dmytriyenko denys@ti.com 2016-07-28T17:00:26+00:00 urn:sha1:460df4154eaa2e62ae077f28e5f8433e3b813f83 Previous commit aacd63f10dd58acf7bf6138e2f4734e37dcf0420 introduced a bug by using _prepend w/o a space at the end, resulting in corrupted EXTRA_OEMAKE variable in packages that inherit cmake_qt5.bbclass. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2016-06-07T18:10:21+00:00 Pascal Bach pascal.bach@siemens.com 2016-05-11T13:53:45+00:00 urn:sha1:aacd63f10dd58acf7bf6138e2f4734e37dcf0420 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> 2016-05-05T15:27:52+00:00 Samuli Piippo samuli.piippo@qt.io 2016-05-05T09:24:20+00:00 urn:sha1:d0266a92febaf578c4d940a97ca1f844af8384d5 * meta-qt5/master: 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 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/0010-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/qtenginio_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch 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/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I703197bf7b3802fa22d48a7c9eb04cfa25657c9f 2016-04-20T08:50:50+00:00 Martin Jansa Martin.Jansa@gmail.com 2016-02-16T16:36:37+00:00 urn:sha1:2f31f2a21b2ef9c5d09806a26af946cb38e61228 * 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> 2016-03-09T12:49:14+00:00 Samuli Piippo samuli.piippo@theqtcompany.com 2016-03-08T09:59:19+00:00 urn:sha1:e29477ac42b47f4fedd2cb4be27ec2e4aa70540c Change-Id: I41732cf1bb97e033c7e2170040834004996d12b1 Reviewed-by: David Schulz <david.schulz@theqtcompany.com> 2016-02-22T10:47:16+00:00 Samuli Piippo samuli.piippo@theqtcompany.com 2016-02-22T07:14:48+00:00 urn:sha1:ddbe177dae46353f08f7326a11d3b3fd5a1f8435 * meta-qt5/master: qttransltations: Add PACKAGE for qtwebengine and qtquickcontrols2 qtwebengine: Hide textrel QA warning until there is proper fix for it qtwebengine: Fix QA warning qtwebkit: Fix QA Warning examples: fix few thousands host-user-contaminated QA warnings qtbase: Don't install libQt* files twice qtbase: Resolve QA warning about /bin/bash dependency qtbase: Fix WORKDIR references in pkg-config files qt5: upgrade to latest revisions in 5.6 branch (5.6 RC) qmake5_base: delete *.la files qt5: add Qml support to lupdate qt3d: support qgltf in native and nativesdk builds qt5: use common PACKAGECONFIG to build examples qt5-git.inc: Ensure we export the SRCREV as the module name qtbase: Fix installation of fonts and libraries 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/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/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_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtgraphicaleffects_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/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_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/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I0a7763f973c32df796cb3e37c753ddbfe43c4521 2016-02-17T21:55:37+00:00 Martin Jansa Martin.Jansa@gmail.com 2016-02-14T10:54:14+00:00 urn:sha1:e91dea65659b0975146ad4f23d46e561ba8d9a08 * 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>