aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtserialbus_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-07-27 17:25:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-05 11:03:12 +0200
commit1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch)
tree8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /recipes-qt/qt5/qtserialbus_git.bb
parent85694b94aa0b1e536eda13e7239720bca114b000 (diff)
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/qtserialbus_git.bb')
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 731bd481..397ac4e9 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -1,13 +1,14 @@
require qt5.inc
require qt5-git.inc
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)"
+LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+)"
LIC_FILES_CHKSUM = " \
- file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
- file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
+ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
+ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
"
DEPENDS += "qtbase qtserialport"
-SRCREV = "f9201ca7bad9220149fb39b89914e83a4a14dffc"
+SRCREV = "88554d068d287870740b842864a50604f53e8509"