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/qtbase-native_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/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 426e0aeb..4da56405 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -2,11 +2,16 @@ DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" | |||
| 2 | DEPENDS = "zlib-native dbus-native" | 2 | DEPENDS = "zlib-native dbus-native" |
| 3 | SECTION = "libs" | 3 | SECTION = "libs" |
| 4 | HOMEPAGE = "http://qt-project.org" | 4 | HOMEPAGE = "http://qt-project.org" |
| 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | |
| 6 | 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 )" | ||
| 6 | LIC_FILES_CHKSUM = " \ | 7 | LIC_FILES_CHKSUM = " \ |
| 7 | file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ | 8 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
| 8 | file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ | 9 | file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ |
| 9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 10 | file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ |
| 11 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
| 12 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
| 13 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
| 14 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
| 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 15 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
| 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 16 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 12 | " | 17 | " |
| @@ -24,12 +29,14 @@ SRC_URI += "\ | |||
| 24 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ | 29 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ |
| 25 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ | 30 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ |
| 26 | file://0008-configure-paths-for-target-qmake-properly.patch \ | 31 | file://0008-configure-paths-for-target-qmake-properly.patch \ |
| 32 | file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ | ||
| 33 | file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ | ||
| 27 | " | 34 | " |
| 28 | 35 | ||
| 29 | # common for qtbase-native and nativesdk-qtbase | 36 | # common for qtbase-native and nativesdk-qtbase |
| 30 | SRC_URI += " \ | 37 | SRC_URI += " \ |
| 31 | file://0009-Always-build-uic.patch \ | 38 | file://0011-Always-build-uic.patch \ |
| 32 | file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ | 39 | file://0012-Add-external-hostbindir-option-for-native-sdk.patch \ |
| 33 | " | 40 | " |
| 34 | 41 | ||
| 35 | CLEANBROKEN = "1" | 42 | CLEANBROKEN = "1" |
| @@ -50,7 +57,6 @@ PACKAGECONFIG_CONFARGS = " \ | |||
| 50 | -no-gif \ | 57 | -no-gif \ |
| 51 | -no-accessibility \ | 58 | -no-accessibility \ |
| 52 | -no-cups \ | 59 | -no-cups \ |
| 53 | -no-nis \ | ||
| 54 | -no-gui \ | 60 | -no-gui \ |
| 55 | -no-qml-debug \ | 61 | -no-qml-debug \ |
| 56 | -no-sql-mysql \ | 62 | -no-sql-mysql \ |
| @@ -117,4 +123,4 @@ do_install() { | |||
| 117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 123 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
| 118 | } | 124 | } |
| 119 | 125 | ||
| 120 | SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" | 126 | SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" |
