diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:25:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:03:12 +0200 |
commit | 1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch) | |
tree | 8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /recipes-qt/qt5/qtwebkit-examples_git.bb | |
parent | 85694b94aa0b1e536eda13e7239720bca114b000 (diff) | |
download | meta-qt5-1a42aa78af040d0fbecc960e4f9dd3f180ccb404.tar.gz |
qt5: upgrade to latest revisions in 5.7 branch
* 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>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit-examples_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebkit-examples_git.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 0920f260..e5075de6 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | 3 | ||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" |
5 | # There are no GPLv2 licensed files in this component. | ||
6 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 | LGPL-3.0)" | ||
7 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
8 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 6 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ |
9 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
@@ -19,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
21 | 19 | ||
22 | SRCREV = "f3f9e2a1b772b718335331a603a6bee748928e49" | 20 | SRCREV = "1ac4ee240214a0e36b504fa1bcbc0c716d50620f" |