diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:51:19 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:09:41 +0200 |
commit | c110de233f0fd56e60b2be996dece64147c332e0 (patch) | |
tree | 394f63daf8c21542c650d3c4bf5c3db85349f430 | |
parent | 4cea8f8c4a6ff2d869b0244c279def2e5adb9e8a (diff) | |
download | meta-qt5-c110de233f0fd56e60b2be996dece64147c332e0.tar.gz |
qt5: upgrade to latest revisions in 5.6 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.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
64 files changed, 223 insertions, 226 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4e551413..ee65b074 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -5,9 +5,9 @@ HOMEPAGE = "http://qt-project.org" | |||
5 | 5 | ||
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=d3bb688e8d381a9fa5ee9063114b366d \ | 8 | file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ |
9 | file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ | 9 | file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ |
10 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 10 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | " | 13 | " |
@@ -30,12 +30,14 @@ SRC_URI += "\ | |||
30 | file://0005-configure-bump-path-length-from-256-to-512-character.patch \ | 30 | file://0005-configure-bump-path-length-from-256-to-512-character.patch \ |
31 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ | 31 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ |
32 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ | 32 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ |
33 | file://0008-configure-paths-for-target-qmake-properly.patch \ | ||
34 | file://0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ | ||
33 | " | 35 | " |
34 | 36 | ||
35 | # common for qtbase-native and nativesdk-qtbase | 37 | # common for qtbase-native and nativesdk-qtbase |
36 | SRC_URI += " \ | 38 | SRC_URI += " \ |
37 | file://0009-Always-build-uic.patch \ | 39 | file://0010-Always-build-uic.patch \ |
38 | file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ | 40 | file://0011-Add-external-hostbindir-option-for-native-sdk.patch \ |
39 | " | 41 | " |
40 | 42 | ||
41 | # CMake's toolchain configuration of nativesdk-qtbase | 43 | # CMake's toolchain configuration of nativesdk-qtbase |
@@ -162,7 +164,6 @@ do_configure() { | |||
162 | -no-gif \ | 164 | -no-gif \ |
163 | -no-accessibility \ | 165 | -no-accessibility \ |
164 | -no-cups \ | 166 | -no-cups \ |
165 | -no-nis \ | ||
166 | -no-gui \ | 167 | -no-gui \ |
167 | -no-qml-debug \ | 168 | -no-qml-debug \ |
168 | -no-sql-mysql \ | 169 | -no-sql-mysql \ |
@@ -257,4 +258,4 @@ fakeroot do_generate_qt_environment_file() { | |||
257 | 258 | ||
258 | addtask generate_qt_environment_file after do_install before do_package | 259 | addtask generate_qt_environment_file after do_install before do_package |
259 | 260 | ||
260 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 261 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" |
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index c9d22231..8ff47a4b 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001 | 1 | From 339e527e5ca0e1b7839d28e9f140630af634b569 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 | 3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
@@ -8,7 +8,7 @@ Subject: [PATCH] Allow a tools-only build | |||
8 | 1 file changed, 6 insertions(+), 1 deletion(-) | 8 | 1 file changed, 6 insertions(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/qt3d.pro b/qt3d.pro | 10 | diff --git a/qt3d.pro b/qt3d.pro |
11 | index a26e76d..263e3c4 100644 | 11 | index a26e76d..016fb30 100644 |
12 | --- a/qt3d.pro | 12 | --- a/qt3d.pro |
13 | +++ b/qt3d.pro | 13 | +++ b/qt3d.pro |
14 | @@ -1,4 +1,4 @@ | 14 | @@ -1,4 +1,4 @@ |
@@ -26,6 +26,3 @@ index a26e76d..263e3c4 100644 | |||
26 | + sub_tools.depends -= sub_src | 26 | + sub_tools.depends -= sub_src |
27 | + SUBDIRS = sub_tools | 27 | + SUBDIRS = sub_tools |
28 | +} | 28 | +} |
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a96b06cf..1b48caf9 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | 3 | ||
4 | LICENSE = "LGPL-3.0 | GPL-2.0" | 4 | LICENSE = "LGPL-3.0 | GPL-2.0+" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ | 6 | file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ |
7 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 7 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
8 | file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ | 8 | file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
@@ -13,7 +13,7 @@ DEPENDS_class-target += "qtdeclarative qt3d-native" | |||
13 | 13 | ||
14 | SRC_URI += " \ | 14 | SRC_URI += " \ |
15 | file://0001-Allow-a-tools-only-build.patch \ | 15 | file://0001-Allow-a-tools-only-build.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | PACKAGECONFIG ??= "" | 18 | PACKAGECONFIG ??= "" |
19 | PACKAGECONFIG_class-native ??= "tools-only" | 19 | PACKAGECONFIG_class-native ??= "tools-only" |
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \ | |||
27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ | 27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" | 30 | SRCREV = "7fab1fa65675dfd62b1ddf6fed3226e465b37b67" |
31 | 31 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 8a6d93e8..30c534ed 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -11,4 +11,4 @@ SRC_URI = " \ | |||
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | PV = "5.6.0+git${SRCPV}" | 14 | PV = "5.6.1+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 73900afe..23fe64ab 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -4,9 +4,9 @@ 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 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ | 7 | file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ |
8 | file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ | 8 | file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
@@ -24,12 +24,13 @@ SRC_URI += "\ | |||
24 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ | 24 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ |
25 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ | 25 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ |
26 | file://0008-configure-paths-for-target-qmake-properly.patch \ | 26 | file://0008-configure-paths-for-target-qmake-properly.patch \ |
27 | file://0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | # common for qtbase-native and nativesdk-qtbase | 30 | # common for qtbase-native and nativesdk-qtbase |
30 | SRC_URI += " \ | 31 | SRC_URI += " \ |
31 | file://0009-Always-build-uic.patch \ | 32 | file://0010-Always-build-uic.patch \ |
32 | file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ | 33 | file://0011-Add-external-hostbindir-option-for-native-sdk.patch \ |
33 | " | 34 | " |
34 | 35 | ||
35 | CLEANBROKEN = "1" | 36 | CLEANBROKEN = "1" |
@@ -50,7 +51,6 @@ PACKAGECONFIG_CONFARGS = " \ | |||
50 | -no-gif \ | 51 | -no-gif \ |
51 | -no-accessibility \ | 52 | -no-accessibility \ |
52 | -no-cups \ | 53 | -no-cups \ |
53 | -no-nis \ | ||
54 | -no-gui \ | 54 | -no-gui \ |
55 | -no-qml-debug \ | 55 | -no-qml-debug \ |
56 | -no-sql-mysql \ | 56 | -no-sql-mysql \ |
@@ -117,4 +117,4 @@ do_install() { | |||
117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
118 | } | 118 | } |
119 | 119 | ||
120 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 120 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" |
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 522afcd1..e606cdbe 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cabe9683b82493e2547e87ae0057f44f71efe519 Mon Sep 17 00:00:00 2001 | 1 | From 46260d1a93e10a6a6f47f38d0b4355b4b63a4682 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | Subject: [PATCH] Add linux-oe-g++ platform |
@@ -56,10 +56,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
56 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 56 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
57 | 57 | ||
58 | diff --git a/configure b/configure | 58 | diff --git a/configure b/configure |
59 | index 3e97c98..88a308d 100755 | 59 | index f4c7813..9ab6a9d 100755 |
60 | --- a/configure | 60 | --- a/configure |
61 | +++ b/configure | 61 | +++ b/configure |
62 | @@ -342,6 +342,16 @@ getQMakeConf() | 62 | @@ -343,6 +343,16 @@ getQMakeConf() |
63 | getSingleQMakeVariable "$1" "$specvals" | 63 | getSingleQMakeVariable "$1" "$specvals" |
64 | } | 64 | } |
65 | 65 | ||
@@ -76,8 +76,8 @@ index 3e97c98..88a308d 100755 | |||
76 | getXQMakeConf() | 76 | getXQMakeConf() |
77 | { | 77 | { |
78 | if [ -z "$xspecvals" ]; then | 78 | if [ -z "$xspecvals" ]; then |
79 | @@ -351,6 +361,16 @@ getXQMakeConf() | 79 | @@ -367,6 +377,16 @@ testXConfig() |
80 | getSingleQMakeVariable "$1" "$xspecvals" | 80 | esac |
81 | } | 81 | } |
82 | 82 | ||
83 | +# OE qmake.conf is reading some variables from shell env | 83 | +# OE qmake.conf is reading some variables from shell env |
@@ -93,7 +93,7 @@ index 3e97c98..88a308d 100755 | |||
93 | compilerSupportsFlag() | 93 | compilerSupportsFlag() |
94 | { | 94 | { |
95 | cat >conftest.cpp <<EOF | 95 | cat >conftest.cpp <<EOF |
96 | @@ -557,24 +577,14 @@ fi | 96 | @@ -573,24 +593,14 @@ fi |
97 | # initalize variables | 97 | # initalize variables |
98 | #------------------------------------------------------------------------------- | 98 | #------------------------------------------------------------------------------- |
99 | 99 | ||
@@ -124,7 +124,7 @@ index 3e97c98..88a308d 100755 | |||
124 | fi'` | 124 | fi'` |
125 | eval "$cmd" | 125 | eval "$cmd" |
126 | done | 126 | done |
127 | @@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 127 | @@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
128 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 128 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
129 | fi | 129 | fi |
130 | 130 | ||
@@ -133,7 +133,7 @@ index 3e97c98..88a308d 100755 | |||
133 | 133 | ||
134 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 134 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
135 | 135 | ||
136 | @@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 136 | @@ -3504,7 +3514,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
137 | exit 1 | 137 | exit 1 |
138 | fi | 138 | fi |
139 | fi | 139 | fi |
@@ -142,7 +142,7 @@ index 3e97c98..88a308d 100755 | |||
142 | 142 | ||
143 | GCC_MACHINE_DUMP= | 143 | GCC_MACHINE_DUMP= |
144 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 144 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
145 | @@ -3976,6 +3986,14 @@ setBootstrapVariable() | 145 | @@ -4005,6 +4015,14 @@ setBootstrapVariable() |
146 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 146 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
147 | } | 147 | } |
148 | 148 | ||
@@ -157,7 +157,7 @@ index 3e97c98..88a308d 100755 | |||
157 | # build qmake | 157 | # build qmake |
158 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 158 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
159 | echo "Creating qmake..." | 159 | echo "Creating qmake..." |
160 | @@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 160 | @@ -4043,14 +4061,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
161 | fi | 161 | fi |
162 | 162 | ||
163 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 163 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
@@ -178,9 +178,9 @@ index 3e97c98..88a308d 100755 | |||
178 | + setBootstrapEvalVariable QMAKE_LFLAGS | 178 | + setBootstrapEvalVariable QMAKE_LFLAGS |
179 | + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS | 179 | + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS |
180 | 180 | ||
181 | if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then | 181 | if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then |
182 | setBootstrapVariable QMAKE_CFLAGS_RELEASE | 182 | setBootstrapVariable QMAKE_CFLAGS_RELEASE |
183 | @@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 183 | @@ -4093,6 +4111,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
184 | \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ | 184 | \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ |
185 | \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" | 185 | \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" |
186 | EXEEXT= | 186 | EXEEXT= |
@@ -189,10 +189,10 @@ index 3e97c98..88a308d 100755 | |||
189 | if [ "$BUILD_ON_MAC" = "yes" ]; then | 189 | if [ "$BUILD_ON_MAC" = "yes" ]; then |
190 | echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" | 190 | echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" |
191 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 191 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf |
192 | index 6b37a04..dcf6025 100644 | 192 | index a3ec227..eef6006 100644 |
193 | --- a/mkspecs/features/configure.prf | 193 | --- a/mkspecs/features/configure.prf |
194 | +++ b/mkspecs/features/configure.prf | 194 | +++ b/mkspecs/features/configure.prf |
195 | @@ -63,12 +63,12 @@ defineTest(qtCompileTest) { | 195 | @@ -71,12 +71,12 @@ defineTest(qtCompileTest) { |
196 | } | 196 | } |
197 | 197 | ||
198 | # Clean up after previous run | 198 | # Clean up after previous run |
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 0b0650d3..41d10eaf 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1edd17d452a7e9eeb2931b3c5697a4fc0ec4e6bc Mon Sep 17 00:00:00 2001 | 1 | From 03824427f227ff16c6d23d08c73708b0faf98e06 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the | 4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the |
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index ca271e6c..f7066371 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 Mon Sep 17 00:00:00 2001 | 1 | From 7421a689c695a09fff2d5ffbdbe56e34d73f771d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] Add -external-hostbindir option | 4 | Subject: [PATCH] Add -external-hostbindir option |
@@ -37,10 +37,10 @@ Conflicts: | |||
37 | 7 files changed, 38 insertions(+), 12 deletions(-) | 37 | 7 files changed, 38 insertions(+), 12 deletions(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index 88a308d..f2611ed 100755 | 40 | index 9ab6a9d..225b9f3 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -810,6 +810,7 @@ QT_HOST_BINS= | 43 | @@ -826,6 +826,7 @@ QT_HOST_BINS= |
44 | QT_HOST_LIBS= | 44 | QT_HOST_LIBS= |
45 | QT_HOST_DATA= | 45 | QT_HOST_DATA= |
46 | QT_EXT_PREFIX= | 46 | QT_EXT_PREFIX= |
@@ -48,7 +48,7 @@ index 88a308d..f2611ed 100755 | |||
48 | 48 | ||
49 | #flags for SQL drivers | 49 | #flags for SQL drivers |
50 | QT_CFLAGS_PSQL= | 50 | QT_CFLAGS_PSQL= |
51 | @@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do | 51 | @@ -945,6 +946,7 @@ while [ "$#" -gt 0 ]; do |
52 | -testsdir| \ | 52 | -testsdir| \ |
53 | -hostdatadir| \ | 53 | -hostdatadir| \ |
54 | -hostbindir| \ | 54 | -hostbindir| \ |
@@ -56,7 +56,7 @@ index 88a308d..f2611ed 100755 | |||
56 | -hostlibdir| \ | 56 | -hostlibdir| \ |
57 | -extprefix| \ | 57 | -extprefix| \ |
58 | -sysroot| \ | 58 | -sysroot| \ |
59 | @@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do | 59 | @@ -1175,6 +1177,9 @@ while [ "$#" -gt 0 ]; do |
60 | extprefix) | 60 | extprefix) |
61 | QT_EXT_PREFIX="$VAL" | 61 | QT_EXT_PREFIX="$VAL" |
62 | ;; | 62 | ;; |
@@ -66,7 +66,7 @@ index 88a308d..f2611ed 100755 | |||
66 | pkg-config) | 66 | pkg-config) |
67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
68 | CFG_PKGCONFIG="$VAL" | 68 | CFG_PKGCONFIG="$VAL" |
69 | @@ -2428,6 +2433,10 @@ Installation options: | 69 | @@ -2444,6 +2449,10 @@ Installation options: |
70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
71 | (default HOSTPREFIX) | 71 | (default HOSTPREFIX) |
72 | 72 | ||
@@ -77,7 +77,7 @@ index 88a308d..f2611ed 100755 | |||
77 | Configure options: | 77 | Configure options: |
78 | 78 | ||
79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
80 | @@ -3172,6 +3181,11 @@ fi | 80 | @@ -3195,6 +3204,11 @@ fi |
81 | # command line and environment validation | 81 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
83 | 83 | ||
@@ -90,7 +90,7 @@ index 88a308d..f2611ed 100755 | |||
90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
91 | case "$CFG_QCONFIG" in | 91 | case "$CFG_QCONFIG" in |
92 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 92 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
93 | index 8639695..d89d948 100644 | 93 | index 4a1d265..a2bdd29 100644 |
94 | --- a/mkspecs/features/qt_functions.prf | 94 | --- a/mkspecs/features/qt_functions.prf |
95 | +++ b/mkspecs/features/qt_functions.prf | 95 | +++ b/mkspecs/features/qt_functions.prf |
96 | @@ -70,7 +70,11 @@ defineTest(qtHaveModule) { | 96 | @@ -70,7 +70,11 @@ defineTest(qtHaveModule) { |
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index a35b6a2a..233a9c57 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 Mon Sep 17 00:00:00 2001 | 1 | From 156a2e3f61258de4127d582895376a1c674e30a6 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements |
@@ -68,7 +68,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
68 | 2 files changed, 14 insertions(+), 1 deletion(-) | 68 | 2 files changed, 14 insertions(+), 1 deletion(-) |
69 | 69 | ||
70 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 70 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
71 | index 75b84ff..ab36fa6 100644 | 71 | index be08a2a..0310cbb 100644 |
72 | --- a/mkspecs/features/qt.prf | 72 | --- a/mkspecs/features/qt.prf |
73 | +++ b/mkspecs/features/qt.prf | 73 | +++ b/mkspecs/features/qt.prf |
74 | @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { | 74 | @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { |
@@ -92,7 +92,7 @@ index 75b84ff..ab36fa6 100644 | |||
92 | contains(QT_CONFIG, static) { | 92 | contains(QT_CONFIG, static) { |
93 | QT_PLUGIN_VERIFY += QTPLUGIN | 93 | QT_PLUGIN_VERIFY += QTPLUGIN |
94 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf | 94 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf |
95 | index cc8ed87..b7d4be2 100644 | 95 | index de9ba9d..e59c5e5 100644 |
96 | --- a/mkspecs/features/qt_common.prf | 96 | --- a/mkspecs/features/qt_common.prf |
97 | +++ b/mkspecs/features/qt_common.prf | 97 | +++ b/mkspecs/features/qt_common.prf |
98 | @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { | 98 | @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { |
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch index e21b36d3..275bd715 100644 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e6ed023b0210375e594b7b61dfb620deb486ee8c Mon Sep 17 00:00:00 2001 | 1 | From 4316f6b00153765fd39a0054896910049c607169 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 | 3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 |
4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters |
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure b/configure | 16 | diff --git a/configure b/configure |
17 | index f2611ed..24a61db 100755 | 17 | index 225b9f3..746a088 100755 |
18 | --- a/configure | 18 | --- a/configure |
19 | +++ b/configure | 19 | +++ b/configure |
20 | @@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 20 | @@ -3959,10 +3959,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ |
21 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; | 21 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; |
22 | 22 | ||
23 | /* Installation Info */ | 23 | /* Installation Info */ |
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch index b6758052..be1a6c30 100644 --- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 05a3901af7a467f9ea5fa9e6f63a574d8d2a9f77 Mon Sep 17 00:00:00 2001 | 1 | From af6fed015c4d685e922ed6761262610910ea2219 Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH] QOpenGLPaintDevice sub-area support |
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 2fab8884..ad9aef65 100644 --- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae Mon Sep 17 00:00:00 2001 | 1 | From 92eafaf0f5902916ca87b8e3bd63040602ff18bf Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 | 3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 |
4 | Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T | 4 | Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T |
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch index 7ca19133..85ec8e89 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b5c826a39760519010884547d6981c3af031d9c8 Mon Sep 17 00:00:00 2001 | 1 | From 92b13af05077dec0d194d4018e36568146d41232 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 | 3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 |
4 | Subject: [PATCH] configure paths for target qmake properly | 4 | Subject: [PATCH] configure paths for target qmake properly |
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 19 insertions(+), 4 deletions(-) | 19 | 1 file changed, 19 insertions(+), 4 deletions(-) |
20 | 20 | ||
21 | diff --git a/configure b/configure | 21 | diff --git a/configure b/configure |
22 | index 24a61db..2e99d39 100755 | 22 | index 746a088..d98ea53 100755 |
23 | --- a/configure | 23 | --- a/configure |
24 | +++ b/configure | 24 | +++ b/configure |
25 | @@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then | 25 | @@ -3904,8 +3904,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then |
26 | QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" | 26 | QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" |
27 | fi | 27 | fi |
28 | 28 | ||
@@ -38,7 +38,7 @@ index 24a61db..2e99d39 100755 | |||
38 | 38 | ||
39 | QT_CONFIGURE_STR_OFF=0 | 39 | QT_CONFIGURE_STR_OFF=0 |
40 | 40 | ||
41 | @@ -3909,7 +3914,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS | 41 | @@ -3938,7 +3943,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS |
42 | 42 | ||
43 | QT_CONFIGURE_STR_OFFSETS= | 43 | QT_CONFIGURE_STR_OFFSETS= |
44 | QT_CONFIGURE_STRS= | 44 | QT_CONFIGURE_STRS= |
@@ -51,7 +51,7 @@ index 24a61db..2e99d39 100755 | |||
51 | addConfStr "$QT_REL_HOST_BINS" | 51 | addConfStr "$QT_REL_HOST_BINS" |
52 | addConfStr "$QT_REL_HOST_LIBS" | 52 | addConfStr "$QT_REL_HOST_LIBS" |
53 | addConfStr "$QT_REL_HOST_DATA" | 53 | addConfStr "$QT_REL_HOST_DATA" |
54 | @@ -3921,6 +3930,12 @@ addConfStr "$shortspec" | 54 | @@ -3950,6 +3959,12 @@ addConfStr "$shortspec" |
55 | #------------------------------------------------------------------------------- | 55 | #------------------------------------------------------------------------------- |
56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" | 56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" |
57 | 57 | ||
@@ -64,7 +64,7 @@ index 24a61db..2e99d39 100755 | |||
64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF | 64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF |
65 | /* License Info */ | 65 | /* License Info */ |
66 | static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; | 66 | static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; |
67 | @@ -3933,7 +3948,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 | 67 | @@ -3962,7 +3977,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 |
68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; | 68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; |
69 | #ifdef QT_BUILD_QMAKE | 69 | #ifdef QT_BUILD_QMAKE |
70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; | 70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; |
diff --git a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index 7a24459c..1825ac23 100644 --- a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f5a949e17aa8b37491fbc414c38557c9920fa1e5 Mon Sep 17 00:00:00 2001 | 1 | From e70b35ba680f2138f0a7ff65852e76248462d459 Mon Sep 17 00:00:00 2001 |
2 | From: Pascal Bach <pascal.bach@siemens.com> | 2 | From: Pascal Bach <pascal.bach@siemens.com> |
3 | Date: Wed, 11 May 2016 15:20:41 +0200 | 3 | Date: Wed, 11 May 2016 15:20:41 +0200 |
4 | Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS | 4 | Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS |
@@ -24,7 +24,6 @@ Upstream-Status: Pending | |||
24 | - 0010-Add-external-hostbindir-option-for-native-sdk.patch | 24 | - 0010-Add-external-hostbindir-option-for-native-sdk.patch |
25 | 25 | ||
26 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> | 26 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> |
27 | |||
28 | --- | 27 | --- |
29 | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ | 28 | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ |
30 | src/corelib/Qt5Config.cmake.in | 5 +++++ | 29 | src/corelib/Qt5Config.cmake.in | 5 +++++ |
@@ -62,6 +61,3 @@ index a872d0e..233d663 100644 | |||
62 | if (NOT Qt5_FIND_COMPONENTS) | 61 | if (NOT Qt5_FIND_COMPONENTS) |
63 | set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") | 62 | set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") |
64 | set(Qt5_FOUND False) | 63 | set(Qt5_FOUND False) |
65 | -- | ||
66 | 2.1.4 | ||
67 | |||
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch index 230c966d..a5915e93 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 49b2100ff86ab5b4977608903b30cb71075592c6 Mon Sep 17 00:00:00 2001 | 1 | From 609d853b42509e8c7da4409e2c97dc44834db564 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH] Always build uic | 4 | Subject: [PATCH] Always build uic |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 1671338..83de483 100644 | 17 | index ed752c3..dbb0b56 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -186,7 +186,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch index 5bb73e75..d257d3f0 100644 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5b4ae15a19a9135d3dc8a35aa2d109ba8d29868a Mon Sep 17 00:00:00 2001 | 1 | From 2aa52f19cab8eafff84d1828367d1e38cb34315d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH] Add -external-hostbindir option for native(sdk) |
@@ -37,10 +37,10 @@ Conflicts: | |||
37 | 5 files changed, 16 insertions(+), 1 deletion(-) | 37 | 5 files changed, 16 insertions(+), 1 deletion(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index 2e99d39..a0641d2 100755 | 40 | index d98ea53..f42abe6 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -3922,6 +3922,7 @@ fi | 43 | @@ -3951,6 +3951,7 @@ fi |
44 | addConfStr "$QT_REL_HOST_BINS" | 44 | addConfStr "$QT_REL_HOST_BINS" |
45 | addConfStr "$QT_REL_HOST_LIBS" | 45 | addConfStr "$QT_REL_HOST_LIBS" |
46 | addConfStr "$QT_REL_HOST_DATA" | 46 | addConfStr "$QT_REL_HOST_DATA" |
@@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644 | |||
94 | HostSpecPath, | 94 | HostSpecPath, |
95 | HostPrefixPath, | 95 | HostPrefixPath, |
96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
97 | index 6f1e2b7..ae03143 100644 | 97 | index f2b54f5..d973c11 100644 |
98 | --- a/tools/configure/configureapp.cpp | 98 | --- a/tools/configure/configureapp.cpp |
99 | +++ b/tools/configure/configureapp.cpp | 99 | +++ b/tools/configure/configureapp.cpp |
100 | @@ -1256,6 +1256,13 @@ void Configure::parseCmdLine() | 100 | @@ -1261,6 +1261,13 @@ void Configure::parseCmdLine() |
101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
102 | } | 102 | } |
103 | 103 | ||
@@ -111,7 +111,7 @@ index 6f1e2b7..ae03143 100644 | |||
111 | else if (configCmdLine.at(i) == "-make-tool") { | 111 | else if (configCmdLine.at(i) == "-make-tool") { |
112 | ++i; | 112 | ++i; |
113 | if (i == argCount) | 113 | if (i == argCount) |
114 | @@ -4232,6 +4239,9 @@ void Configure::generateQConfigCpp() | 114 | @@ -4258,6 +4265,9 @@ void Configure::generateQConfigCpp() |
115 | 115 | ||
116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) | 116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) |
117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; | 117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; |
@@ -121,7 +121,7 @@ index 6f1e2b7..ae03143 100644 | |||
121 | 121 | ||
122 | confStringOff = 0; | 122 | confStringOff = 0; |
123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); | 123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); |
124 | @@ -4251,6 +4261,7 @@ void Configure::generateQConfigCpp() | 124 | @@ -4277,6 +4287,7 @@ void Configure::generateQConfigCpp() |
125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); | 125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); |
126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); | 126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); |
127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); | 127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1ce8cd66..a46a91ff 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -3,9 +3,9 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ | 6 | file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ |
7 | file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ | 7 | file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | " | 11 | " |
@@ -20,7 +20,7 @@ SRC_URI += "\ | |||
20 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ | 20 | file://0006-QOpenGLPaintDevice-sub-area-support.patch \ |
21 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ | 21 | file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ |
22 | file://0008-configure-paths-for-target-qmake-properly.patch \ | 22 | file://0008-configure-paths-for-target-qmake-properly.patch \ |
23 | file://0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ | 23 | file://0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ |
24 | " | 24 | " |
25 | 25 | ||
26 | DEPENDS += "qtbase-native" | 26 | DEPENDS += "qtbase-native" |
@@ -81,8 +81,9 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" | |||
81 | PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" | 81 | PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" |
82 | PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" | 82 | PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" |
83 | PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" | 83 | PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" |
84 | PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl" | 84 | PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,virtual/drm" |
85 | PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" | 85 | PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl" |
86 | PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl" | ||
86 | PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" | 87 | PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" |
87 | PACKAGECONFIG[cups] = "-cups,-no-cups,cups" | 88 | PACKAGECONFIG[cups] = "-cups,-no-cups,cups" |
88 | PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" | 89 | PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" |
@@ -125,7 +126,6 @@ PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" | |||
125 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" | 126 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" |
126 | PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" | 127 | PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" |
127 | PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" | 128 | PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" |
128 | PACKAGECONFIG[nis] = "-nis,-no-nis" | ||
129 | PACKAGECONFIG[widgets] = "-widgets,-no-widgets" | 129 | PACKAGECONFIG[widgets] = "-widgets,-no-widgets" |
130 | PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" | 130 | PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" |
131 | PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" | 131 | PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" |
@@ -262,4 +262,4 @@ sysroot_stage_dirs_append() { | |||
262 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} | 262 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} |
263 | } | 263 | } |
264 | 264 | ||
265 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 265 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 5b12d1a7..c7ec72ab 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -3,11 +3,11 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "LGPL-3.0 | GPL-3.0" | 4 | LICENSE = "LGPL-3.0 | GPL-3.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 6 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
7 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 7 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
8 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 8 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b" | 13 | SRCREV = "95884805facd1721eea025467afd85ed64a70504" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 03990d85..94c331b5 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -3,12 +3,12 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 11 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS += "qtbase qtdeclarative" | 14 | DEPENDS += "qtbase qtdeclarative" |
@@ -25,4 +25,4 @@ do_configure_prepend() { | |||
25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "dedff12a896d51c469d2af82664b86a10f8fa7fe" | 28 | SRCREV = "71a0d199a29001cc31bfde15aabcc53cf88aae1e" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index ee568200..b0e5fe85 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d26a676827ef2d64b4627090690d3240e62f6565 Mon Sep 17 00:00:00 2001 | 1 | From 8228a74e72ad130f8ab91dd3ebe1969c0acfd81b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
@@ -60,7 +60,7 @@ index c6d442e..3181dcd 100644 | |||
60 | +QT += core-private qml-private testlib gui gui-private quick | 60 | +QT += core-private qml-private testlib gui gui-private quick |
61 | DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 | 61 | DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |
62 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro | 62 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro |
63 | index 7662cb1..a8f8ae2 100644 | 63 | index 175ed42..83e5d7d 100644 |
64 | --- a/tests/auto/qmltest/qmltest.pro | 64 | --- a/tests/auto/qmltest/qmltest.pro |
65 | +++ b/tests/auto/qmltest/qmltest.pro | 65 | +++ b/tests/auto/qmltest/qmltest.pro |
66 | @@ -4,6 +4,7 @@ CONFIG += qmltestcase | 66 | @@ -4,6 +4,7 @@ CONFIG += qmltestcase |
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch index 60c9685f..915d924d 100644 --- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 | 1 | From b958ab5685384a4c612f13c8cb83fa6b87fee18e Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 | 3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 |
4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been | 4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 72b3d7be..195ec51a 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -4,9 +4,9 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
@@ -34,6 +34,6 @@ do_configure_prepend() { | |||
34 | 34 | ||
35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
36 | 36 | ||
37 | SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed" | 37 | SRCREV = "a05f59388e004160899d5d311884cfabe10c3b8c" |
38 | 38 | ||
39 | BBCLASSEXTEND =+ "native nativesdk" | 39 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 04f5a79d..6135898b 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -3,12 +3,13 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 4 | LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 13 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
13 | 14 | ||
14 | SRCREV = "cf717b99fdb1b7221dd556bf3be32feba0ed8afe" | 15 | SRCREV = "6c37300c667e3049178f049a5b86e7ea955c9671" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 606b873a..24ae3e1b 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -5,16 +5,16 @@ require qt5-git.inc | |||
5 | # There are no GPLv2 licensed files in this component. | 5 | # There are no GPLv2 licensed files in this component. |
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=4bfd28363f541b10d9f024181b8df516 \ |
9 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 9 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
10 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 10 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 13 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS += "qtdeclarative" | 16 | DEPENDS += "qtdeclarative" |
17 | 17 | ||
18 | RDEPENDS_${PN}-dev = "" | 18 | RDEPENDS_${PN}-dev = "" |
19 | 19 | ||
20 | SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" | 20 | SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5" |
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch index 12118980..15b69f4f 100644 --- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c4c008c46291be290312b5674af1c1b9c446fa8e Mon Sep 17 00:00:00 2001 | 1 | From ff035d111c39a0f3b1b5a93e99d266341878f573 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 | 3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 |
4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic | 4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 573b3303..37e1f401 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -3,12 +3,12 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 11 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" | 31 | SRCREV = "99f384ac2353df89a1522e47c96cae6a945749e1" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8a41551b..59be91fc 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -3,12 +3,12 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 11 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" | 14 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" |
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" | 32 | SRCREV = "04762a9eecafc80ebeb90c06258de551d451497f" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 328fdd74..71e78abb 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -4,9 +4,9 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV = "2170a3b0fcda613daf76a337fa45cb97e0714cdf" | 38 | SRCREV = "d7d31d63db5f0029a4a5e24d998601baee8bade0" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 61b02a17..f826b54c 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -6,11 +6,12 @@ require qt5-git.inc | |||
6 | # Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1. | 6 | # Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1. |
7 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 7 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
8 | LIC_FILES_CHKSUM = " \ | 8 | LIC_FILES_CHKSUM = " \ |
9 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 9 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
10 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 10 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
11 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 14 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
14 | " | 15 | " |
15 | 16 | ||
16 | DEPENDS += "qtscript qtsvg qtxmlpatterns" | 17 | DEPENDS += "qtscript qtsvg qtxmlpatterns" |
@@ -23,4 +24,4 @@ do_configure_prepend() { | |||
23 | sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro | 24 | sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro |
24 | } | 25 | } |
25 | 26 | ||
26 | SRCREV = "563ce3888f3c04abcc96ba236b20c7a822bc88e2" | 27 | SRCREV = "e90625f00a3727ca1c89a94407b7686327d03c19" |
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch index c57943d9..fb7c5e1a 100644 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d5faf29f8a41b0e28132fb23828cff8043174cb8 Mon Sep 17 00:00:00 2001 | 1 | From 0dcc16dafac2fec76c178f3b3195f57bb2ac3d8e Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 | 3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 |
4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' | 4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' |
@@ -7,13 +7,13 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | 8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> |
9 | --- | 9 | --- |
10 | examples/quick/controls/texteditor/src/documenthandler.cpp | 1 + | 10 | examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + |
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp | 13 | diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
14 | index 2e03f74..3d1b3c8 100644 | 14 | index 2e03f74..3d1b3c8 100644 |
15 | --- a/examples/quick/controls/texteditor/src/documenthandler.cpp | 15 | --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
16 | +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp | 16 | +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
17 | @@ -44,6 +44,7 @@ | 17 | @@ -44,6 +44,7 @@ |
18 | #include <QtGui/QTextCursor> | 18 | #include <QtGui/QTextCursor> |
19 | #include <QtGui/QFontDatabase> | 19 | #include <QtGui/QFontDatabase> |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e3c580fe..66ec15e9 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -4,12 +4,12 @@ require qt5-git.inc | |||
4 | LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" | 4 | LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 6 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
7 | file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ | 7 | file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | DEPENDS += "qtdeclarative" | 11 | DEPENDS += "qtdeclarative" |
12 | 12 | ||
13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" | 13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" |
14 | 14 | ||
15 | SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0" | 15 | SRCREV = "eed9b9dd83f0db9cbfe794072d8f5147e3d1234a" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7a5ca233..42d504e2 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -3,10 +3,10 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-2.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 6 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
7 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 7 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
8 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 9 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
9 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | ||
10 | " | 10 | " |
11 | 11 | ||
12 | DEPENDS += "qtdeclarative" | 12 | DEPENDS += "qtdeclarative" |
@@ -17,4 +17,4 @@ SRC_URI += " \ | |||
17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "01e52200e2a76ec51c3bb9710617ac0c249a78bc" | 20 | SRCREV = "84a26f223b220a444dec2b43fffc71dab7e00d1d" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 565ca843..21199f76 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -5,9 +5,9 @@ require qt5-git.inc | |||
5 | # Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1. | 5 | # Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1. |
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=4bfd28363f541b10d9f024181b8df516 \ |
9 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 9 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
10 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 10 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | " | 13 | " |
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
27 | 27 | ||
28 | DEPENDS += "qtbase" | 28 | DEPENDS += "qtbase" |
29 | 29 | ||
30 | SRCREV = "b16873afea798d08799d7a0b255b8d200337f35b" | 30 | SRCREV = "9dc78a2d847bca5ec7b1445356523383a030d7ce" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 16c20956..e599617c 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -5,14 +5,13 @@ require qt5-git.inc | |||
5 | # There are no GPLv2 licensed files in this component. | 5 | # There are no GPLv2 licensed files in this component. |
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=4bfd28363f541b10d9f024181b8df516 \ |
9 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 9 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
10 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 10 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | ||
14 | " | 13 | " |
15 | 14 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 15 | DEPENDS += "qtbase qtdeclarative" |
17 | 16 | ||
18 | SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" | 17 | SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 4139db1f..10780bea 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -5,14 +5,14 @@ require qt5-git.inc | |||
5 | # other qt* components use :/ | 5 | # other qt* components use :/ |
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=4bfd28363f541b10d9f024181b8df516 \ |
9 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 9 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
10 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 10 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
11 | file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ | 11 | file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ |
12 | file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ | 12 | file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ |
13 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 13 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478" | 18 | SRCREV = "133dbd59fb04974149d2140b267fce91a7cfd4a2" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 6c300e5b..145ac65f 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -4,13 +4,13 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "e02df9c098b4d304b34c0ff65806a0576e45ed1a" | 16 | SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96" |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 8cbe0e0c..de316a55 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -33,4 +33,4 @@ QT_MODULE_BRANCH = "dev" | |||
33 | # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 33 | # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
34 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 | 34 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 |
35 | 35 | ||
36 | SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" | 36 | SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" |
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index dbb94381..25cf6fe9 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c6d62fcf2e02b5a86c36b4afd78dfb7a3f29ad91 Mon Sep 17 00:00:00 2001 | 1 | From 782bef8198cc5aacd7b11903a4e4739950d6b90c Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.jansa@gmail.com> | 2 | From: Martin Jansa <Martin.jansa@gmail.com> |
3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert |
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index b5e92934..b3145136 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 34f23c43f1c656ccd424528821a9ac65a98c5fec Mon Sep 17 00:00:00 2001 | 1 | From b7e29ffe5f00847de7e87a183e0ff2ecf0cccb20 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH] assistant/help: fix linking of dependent libraries |
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index f0f40b7a..ea487c52 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b77f225e25360832074692681c5ff7c13862102d Mon Sep 17 00:00:00 2001 | 1 | From 79a9f6a65355203fc49fa610f6bb9fe8ddd07cda Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH] add noqtwebkit configuration | 4 | Subject: [PATCH] add noqtwebkit configuration |
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index 16ff71e4..b9a68f89 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e65c5ea9f7ce6fade201ed15b44dcb4d82219b3f Mon Sep 17 00:00:00 2001 | 1 | From a2d297031e08f986189761dafdac78a95db39de8 Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | 3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 |
4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for | 4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e0b23b4b..87854aff 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -3,9 +3,9 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \ | 6 | file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ |
7 | file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \ | 7 | file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ |
8 | file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6 \ | 8 | file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | " | 11 | " |
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d" | 34 | SRCREV = "bda7ece99a8162118a91e9f475c149be39846ecd" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 93b147d8..5e11d24f 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -3,9 +3,9 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "(LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 4 | LICENSE = "(LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | " | 10 | " |
11 | 11 | ||
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 115 | " |
116 | 116 | ||
117 | SRCREV = "13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f" | 117 | SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index ca47da84..8fc18623 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 | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
@@ -25,4 +25,4 @@ do_install() { | |||
25 | oe_runmake install INSTALL_ROOT=${D} | 25 | oe_runmake install INSTALL_ROOT=${D} |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" | 28 | SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" |
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index 45493cf5..6c65e2a4 100644 --- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cadcacf58301251629a63ecd2682d58e6bf24cb8 Mon Sep 17 00:00:00 2001 | 1 | From 58cea434f7b4f0f2469ba6e8eb892a448e20f6a6 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 | 3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 |
4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side | 4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side |
diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch index f39707c6..64027101 100644 --- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52971db84e3b2c429e8777953c0532dcb88b8e6b Mon Sep 17 00:00:00 2001 | 1 | From 2be2c512d07fb013022c9ccb7d81308295e71866 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 | 3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 |
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | 4 | Subject: [PATCH] examples/wayland: include server-buffer only when building |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a1cee864..3153dc06 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -4,9 +4,9 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
@@ -36,4 +36,4 @@ SRC_URI += " \ | |||
36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" | 39 | SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 79c6b23f..55a1cb92 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -5,14 +5,14 @@ require qt5-git.inc | |||
5 | # There are no GPLv2 licensed files in this component. | 5 | # There are no GPLv2 licensed files in this component. |
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=4bfd28363f541b10d9f024181b8df516 \ |
9 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 9 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
10 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 10 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
11 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 11 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS += "qtdeclarative qtwebsockets" | 16 | DEPENDS += "qtdeclarative qtwebsockets" |
17 | 17 | ||
18 | SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" | 18 | SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index 75350c17..28e5540b 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 04be78d20ecc23e289e171e907bb5daf9393619d Mon Sep 17 00:00:00 2001 | 1 | From 092e3c94fbec392c6b2f29bc2999595a10d0e66f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | 4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc |
@@ -6,7 +6,7 @@ Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | |||
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | --- | 8 | --- |
9 | src/3rdparty/chromium/base/base.gypi | 2 +- | 9 | chromium/base/base.gypi | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | 12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi |
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index c95fad09..fed7f11f 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dde0edc1681bb49580584028c2d7b5757e177cd1 Mon Sep 17 00:00:00 2001 | 1 | From 8d94528e14cc00934a0beaac53fa990567740596 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
13 | index 2df689b..8d984c7 100644 | 13 | index a4abf45..47311c6 100644 |
14 | --- a/tools/qmake/mkspecs/features/functions.prf | 14 | --- a/tools/qmake/mkspecs/features/functions.prf |
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | 15 | +++ b/tools/qmake/mkspecs/features/functions.prf |
16 | @@ -131,9 +131,9 @@ defineReplace(mocOutput) { | 16 | @@ -125,9 +125,9 @@ defineReplace(mocOutput) { |
17 | out = $$1 | 17 | out = $$1 |
18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 00432bc0..ab6dbb69 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3ae00f0217e4a0039f0855ea6cd945209b1734ee Mon Sep 17 00:00:00 2001 | 1 | From eaaf8074a826137d3ad061f4c09bb36f449188a3 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 | 3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 |
4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX | 4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX |
@@ -7,7 +7,7 @@ Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX | |||
7 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | 7 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> |
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
9 | --- | 9 | --- |
10 | src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ | 10 | chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ |
11 | 1 file changed, 6 insertions(+), 6 deletions(-) | 11 | 1 file changed, 6 insertions(+), 6 deletions(-) |
12 | 12 | ||
13 | diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 13 | diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc |
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 18f268ce..822aefbe 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6576e3135b839b53c422befac0a233f6dd1966bf Mon Sep 17 00:00:00 2001 | 1 | From 19f7088dd18c4966ec40501cd7e07a0ea16613ae Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to |
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 8d984c7..055e960 100644 | 14 | index 47311c6..be2b2a5 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -122,7 +122,8 @@ defineReplace(findIncludedMocFiles) { |
18 | } | 18 | } |
19 | 19 | ||
20 | defineReplace(mocOutput) { | 20 | defineReplace(mocOutput) { |
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 78cb3fc4..609330d6 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f Mon Sep 17 00:00:00 2001 | 1 | From 99e307a75a331e60cb9bcb6d75bc3e0afb8e1b24 Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
15 | index 055e960..379c9b5 100644 | 15 | index be2b2a5..fb650c2 100644 |
16 | --- a/tools/qmake/mkspecs/features/functions.prf | 16 | --- a/tools/qmake/mkspecs/features/functions.prf |
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | 17 | +++ b/tools/qmake/mkspecs/features/functions.prf |
18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { | 18 | @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { |
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index 901462cd..d6069ae5 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a2670f5ad67822b399e9dd7b3b87589be1da9749 Mon Sep 17 00:00:00 2001 | 1 | From dd72b83e84d0c9f8034096ff2db3d826ba708eb6 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor |
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
12 | index 65bf25e..0447d07 100644 | 12 | index 0fd187a..54b4b7f 100644 |
13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
15 | @@ -56,6 +56,8 @@ | 15 | @@ -56,6 +56,8 @@ |
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index fa3faf45..d420c339 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001 | 1 | From 149dd23e66b3e0ea64f090478ac974a51e0b6a42 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() | 4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 427cd958..28b9fe64 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -4,9 +4,9 @@ LICENSE = "LGPL-3.0 & BSD" | |||
4 | LIC_FILES_CHKSUM = " \ | 4 | LIC_FILES_CHKSUM = " \ |
5 | file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ | 5 | file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ |
6 | file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ | 6 | file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ |
7 | file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ | 7 | file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 9 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
10 | " | 10 | " |
11 | 11 | ||
12 | DEPENDS += " \ | 12 | DEPENDS += " \ |
@@ -119,8 +119,10 @@ SRC_URI += " \ | |||
119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
120 | " | 120 | " |
121 | 121 | ||
122 | SRCREV_qtwebengine = "643aa579fc94933eefa8eb20af6729e2140cf480" | 122 | SRCREV_qtwebengine = "808ca6e6917cf17e4c30fcd3ac609164b36594cc" |
123 | SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c" | 123 | # This is in git submodule, but we're using latest in 45-based |
124 | # SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" | ||
125 | SRCREV_chromium = "9d6566ee193e8996fb867cf776dc13f697400f24" | ||
124 | SRCREV = "${SRCREV_qtwebengine}" | 126 | SRCREV = "${SRCREV_qtwebengine}" |
125 | 127 | ||
126 | SRCREV_FORMAT = "qtwebengine_chromium" | 128 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 933220de..3f1ab500 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
21 | 21 | ||
22 | SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34" | 22 | SRCREV = "2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383" |
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index 1f3dd2a7..2ed9558d 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3e321803386278c52508d114f5096883e974a4bb Mon Sep 17 00:00:00 2001 | 1 | From 24f843d4b73de923712c40335068f6f32ff65c7c Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | 2 | From: Trevor Woerner <trevor.woerner@linaro.org> |
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | 3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 |
4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) | 4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) |
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch index 2114b42c..ebed7294 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001 | 1 | From 63d1bab5741e08b91549a55ff039eeac36e745b8 Mon Sep 17 00:00:00 2001 |
2 | From: Magnus Granberg <zorry@gentoo.org> | 2 | From: Magnus Granberg <zorry@gentoo.org> |
3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 | 3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 |
4 | Subject: [PATCH] Remove TEXTREL tag in x86 | 4 | Subject: [PATCH] Remove TEXTREL tag in x86 |
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch index 5edc9392..32a05c1b 100644 --- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001 | 1 | From cec1f02bcd1e484fe422e98562a093541c9c9011 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 | 3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 |
4 | Subject: [PATCH] Exclude backtrace() API for non-glibc libraries | 4 | Subject: [PATCH] Exclude backtrace() API for non-glibc libraries |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index eb05ce24..c71850a1 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
73 | 73 | ||
74 | SRCREV = "71136c9621103522e85654c8e144d5f1c961de1c" | 74 | SRCREV = "a6c9dd667d534d3342bfba456f9d5c146a924de0" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 66d9d741..04f762ed 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -3,12 +3,12 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 4 | LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ | 9 | file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ |
10 | " | 10 | " |
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "ba9306ec5a1271275d79b2f48ceb227f79352f33" | 14 | SRCREV = "e66dcd51d0e5517e88cd59912fd08501522a2902" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index d8beb500..eaed56c4 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -3,14 +3,14 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
7 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 11 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4" | 16 | SRCREV = "df10edcfae328f397c99192b322268c9e96f6dab" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d78df146..e6962a60 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -4,15 +4,15 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | 7 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ |
8 | file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ | 8 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | 10 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "5e6acdb2ea92add793835561e7a2d6b0ed8890f8" | 16 | SRCREV = "c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |