diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-18 16:43:50 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-19 11:17:41 +0300 |
| commit | c433b617de5e5363b252a80240f053b103e35e01 (patch) | |
| tree | b85b0504d707cfb17ba6ce9989f4270e4f718010 /recipes-qt/qt5/qtwayland-native_git.bb | |
| parent | ce9a8d9537e3baa7d485128a3f41451d7dca7770 (diff) | |
| parent | ccae79be69c5268df3b47e4e14cea0591c39a531 (diff) | |
Merge remote-tracking branch 'meta-qt5/krogoth' into master-mingw
* 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
Diffstat (limited to 'recipes-qt/qt5/qtwayland-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwayland-native_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 6122db41..786271d0 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -4,9 +4,9 @@ require qt5-git.inc # There are no LGPLv3-only licensed files in this component. LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ - file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " @@ -25,4 +25,4 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -SRCREV = "d9132f078bb168a9a013b97493c219596cc8c6b2" +SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" |