diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:56:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-25 14:24:08 +0200 |
commit | 8f765ed71128ecc50aa7cd464be1332658df6e10 (patch) | |
tree | 14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
parent | 52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff) | |
download | meta-qt5-8f765ed71128ecc50aa7cd464be1332658df6e10.tar.gz |
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 9c9d86fd..30033238 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -6,7 +6,8 @@ HOMEPAGE = "http://qt-project.org" | |||
6 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 6 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
7 | LIC_FILES_CHKSUM = " \ | 7 | LIC_FILES_CHKSUM = " \ |
8 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 8 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
9 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ | 9 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ |
10 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | ||
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 13 | " |
@@ -28,18 +29,17 @@ SRC_URI += "\ | |||
28 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ | 29 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ |
29 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ | 30 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ |
30 | file://0007-QOpenGLPaintDevice-sub-area-support.patch \ | 31 | file://0007-QOpenGLPaintDevice-sub-area-support.patch \ |
31 | file://0008-Fix-build-with-clang-3.7.patch \ | ||
32 | " | 32 | " |
33 | 33 | ||
34 | # common for qtbase-native and nativesdk-qtbase | 34 | # common for qtbase-native and nativesdk-qtbase |
35 | SRC_URI += " \ | 35 | SRC_URI += " \ |
36 | file://0009-Always-build-uic.patch \ | 36 | file://0008-Always-build-uic.patch \ |
37 | file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ | 37 | file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ |
38 | " | 38 | " |
39 | 39 | ||
40 | # specific for nativesdk-qtbase | 40 | # specific for nativesdk-qtbase |
41 | SRC_URI += " \ | 41 | SRC_URI += " \ |
42 | file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \ | 42 | file://0010-configure-preserve-built-qmake-and-swap-with-native-.patch \ |
43 | " | 43 | " |
44 | 44 | ||
45 | # CMake's toolchain configuration of nativesdk-qtbase | 45 | # CMake's toolchain configuration of nativesdk-qtbase |
@@ -278,4 +278,4 @@ fakeroot do_generate_qt_environment_file() { | |||
278 | 278 | ||
279 | addtask generate_qt_environment_file after do_install before do_package | 279 | addtask generate_qt_environment_file after do_install before do_package |
280 | 280 | ||
281 | SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" | 281 | SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90" |