diff options
95 files changed, 256 insertions, 267 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 3e33af02..b684a6b8 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | # Select which version you prefer by defining QT5_VERSION and including this file | 1 | # Select which version you prefer by defining QT5_VERSION and including this file |
2 | # possible values now "5.2.0", "5.2.0+git%" | 2 | # possible values now "5.2.1", "5.2.1+git%" |
3 | 3 | ||
4 | QT5_VERSION ?= "5.2.0" | 4 | QT5_VERSION ?= "5.2.1" |
5 | 5 | ||
6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" | 6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" |
7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" | 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" |
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb deleted file mode 100644 index aca8dea0..00000000 --- a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" | ||
5 | SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" | ||
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb new file mode 100644 index 00000000..c106d227 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" | ||
5 | SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" | ||
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb deleted file mode 100644 index 0effa1bf..00000000 --- a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" | ||
5 | SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" | ||
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb new file mode 100644 index 00000000..d186a213 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" | ||
5 | SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" | ||
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7ca9bf85..aaa9c04f 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -4,7 +4,7 @@ require ${PN}.inc | |||
4 | QT_MODULE_BRANCH = "master" | 4 | QT_MODULE_BRANCH = "master" |
5 | 5 | ||
6 | # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already | 6 | # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already |
7 | SRCREV = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9" | 7 | SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad" |
8 | 8 | ||
9 | do_configure_prepend() { | 9 | do_configure_prepend() { |
10 | # Temporary hack to get qt3d build for Qt 5.1.0 | 10 | # Temporary hack to get qt3d build for Qt 5.1.0 |
diff --git a/recipes-qt/qt5/qt5-5.2.0.inc b/recipes-qt/qt5/qt5-5.2.1.inc index 50e8a7a0..50e8a7a0 100644 --- a/recipes-qt/qt5/qt5-5.2.0.inc +++ b/recipes-qt/qt5/qt5-5.2.1.inc | |||
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 97a1c37d..fa0c06e6 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | # Copyright (C) 2012 O.S. Systems Software LTDA. | 1 | # Copyright (C) 2012 O.S. Systems Software LTDA. |
2 | # Copyright (C) 2013 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE_BRANCH ?= "stable" | 4 | QT_MODULE_BRANCH ?= "stable" |
5 | 5 | ||
@@ -10,7 +10,7 @@ SRC_URI += " \ | |||
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | PV = "5.2.0+git${SRCPV}" | 13 | PV = "5.2.1+git${SRCPV}" |
14 | 14 | ||
15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" | 15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" |
16 | 16 | ||
diff --git a/recipes-qt/qt5/qtbase-native_5.2.0.bb b/recipes-qt/qt5/qtbase-native_5.2.1.bb index 8ccd16df..54adc48f 100644 --- a/recipes-qt/qt5/qtbase-native_5.2.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.2.1.bb | |||
@@ -7,5 +7,5 @@ do_install_append() { | |||
7 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 7 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
8 | } | 8 | } |
9 | 9 | ||
10 | SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" | 10 | SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" |
11 | SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" | 11 | SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 471d95b3..c69b631a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -7,4 +7,4 @@ do_install_append() { | |||
7 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 7 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
8 | } | 8 | } |
9 | 9 | ||
10 | SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" | 10 | SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0" |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 83ce25b5..f0563938 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -18,7 +18,6 @@ SRC_URI += "\ | |||
18 | file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ | 18 | file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ |
19 | file://0012-qtbase-allow-build-of-examples.patch \ | 19 | file://0012-qtbase-allow-build-of-examples.patch \ |
20 | file://0013-QOpenGLPaintDevice-sub-area-support.patch \ | 20 | file://0013-QOpenGLPaintDevice-sub-area-support.patch \ |
21 | file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ | ||
22 | " | 21 | " |
23 | 22 | ||
24 | DEPENDS += "qtbase-native" | 23 | DEPENDS += "qtbase-native" |
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 0976c343..5ce4cdd1 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 f4fd2da9b29db23638ad07bd35f093f793241526 Mon Sep 17 00:00:00 2001 | 1 | From f883ec8652ee603d9bb9def7eb669ed82c493961 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 01/14] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/14] Add linux-oe-g++ platform |
@@ -41,7 +41,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
41 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 41 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
42 | 42 | ||
43 | diff --git a/configure b/configure | 43 | diff --git a/configure b/configure |
44 | index a330dd6..1b328ae 100755 | 44 | index aaa59bd..0e74f29 100755 |
45 | --- a/configure | 45 | --- a/configure |
46 | +++ b/configure | 46 | +++ b/configure |
47 | @@ -324,6 +324,16 @@ getQMakeConf() | 47 | @@ -324,6 +324,16 @@ getQMakeConf() |
@@ -97,7 +97,7 @@ index a330dd6..1b328ae 100755 | |||
97 | SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | 97 | SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" |
98 | for varname in $SYSTEM_VARIABLES; do | 98 | for varname in $SYSTEM_VARIABLES; do |
99 | qmakevarname="${varname}" | 99 | qmakevarname="${varname}" |
100 | @@ -3344,7 +3376,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then | 100 | @@ -3362,7 +3394,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then |
101 | CFG_QGTKSTYLE=no | 101 | CFG_QGTKSTYLE=no |
102 | fi | 102 | fi |
103 | 103 | ||
@@ -106,7 +106,7 @@ index a330dd6..1b328ae 100755 | |||
106 | 106 | ||
107 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 107 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
108 | 108 | ||
109 | @@ -3379,7 +3411,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 109 | @@ -3397,7 +3429,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
110 | exit 1 | 110 | exit 1 |
111 | fi | 111 | fi |
112 | fi | 112 | fi |
@@ -115,7 +115,7 @@ index a330dd6..1b328ae 100755 | |||
115 | 115 | ||
116 | GCC_MACHINE_DUMP= | 116 | GCC_MACHINE_DUMP= |
117 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 117 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
118 | @@ -3860,6 +3892,14 @@ setBootstrapVariable() | 118 | @@ -3878,6 +3910,14 @@ setBootstrapVariable() |
119 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 119 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
120 | } | 120 | } |
121 | 121 | ||
@@ -130,7 +130,7 @@ index a330dd6..1b328ae 100755 | |||
130 | # build qmake | 130 | # build qmake |
131 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 131 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
132 | echo "Creating qmake..." | 132 | echo "Creating qmake..." |
133 | @@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 133 | @@ -3916,11 +3956,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
134 | fi | 134 | fi |
135 | 135 | ||
136 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 136 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
@@ -300,5 +300,5 @@ index 0000000..dd12003 | |||
300 | + | 300 | + |
301 | +#endif // QPLATFORMDEFS_H | 301 | +#endif // QPLATFORMDEFS_H |
302 | -- | 302 | -- |
303 | 1.8.5.2 | 303 | 1.8.5.3 |
304 | 304 | ||
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 afc25cc4..2f72dca5 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 c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001 | 1 | From 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a 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 02/14] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside |
@@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644 | |||
32 | if(!QFile::exists(qtconfig)) | 32 | if(!QFile::exists(qtconfig)) |
33 | qtconfig = qt_libraryInfoFile(); | 33 | qtconfig = qt_libraryInfoFile(); |
34 | -- | 34 | -- |
35 | 1.8.5.2 | 35 | 1.8.5.3 |
36 | 36 | ||
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 3f7854fd..7e03f740 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 21c595fd0e386bea1a2e2b19323dc517bb2c7333 Mon Sep 17 00:00:00 2001 | 1 | From 3648eeddaed0cf31fba226ec713d2321f398974f 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 03/14] Add -external-hostbindir option | 4 | Subject: [PATCH 03/14] Add -external-hostbindir option |
@@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
28 | 8 files changed, 45 insertions(+), 7 deletions(-) | 28 | 8 files changed, 45 insertions(+), 7 deletions(-) |
29 | 29 | ||
30 | diff --git a/configure b/configure | 30 | diff --git a/configure b/configure |
31 | index 1b328ae..46f7230 100755 | 31 | index 0e74f29..7f3f2f0 100755 |
32 | --- a/configure | 32 | --- a/configure |
33 | +++ b/configure | 33 | +++ b/configure |
34 | @@ -785,6 +785,7 @@ QT_HOST_BINS= | 34 | @@ -788,6 +788,7 @@ QT_HOST_BINS= |
35 | QT_HOST_LIBS= | 35 | QT_HOST_LIBS= |
36 | QT_HOST_DATA= | 36 | QT_HOST_DATA= |
37 | QT_EXT_PREFIX= | 37 | QT_EXT_PREFIX= |
@@ -39,7 +39,7 @@ index 1b328ae..46f7230 100755 | |||
39 | 39 | ||
40 | #flags for SQL drivers | 40 | #flags for SQL drivers |
41 | QT_CFLAGS_PSQL= | 41 | QT_CFLAGS_PSQL= |
42 | @@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do | 42 | @@ -907,6 +908,7 @@ while [ "$#" -gt 0 ]; do |
43 | -testsdir| \ | 43 | -testsdir| \ |
44 | -hostdatadir| \ | 44 | -hostdatadir| \ |
45 | -hostbindir| \ | 45 | -hostbindir| \ |
@@ -47,7 +47,7 @@ index 1b328ae..46f7230 100755 | |||
47 | -hostlibdir| \ | 47 | -hostlibdir| \ |
48 | -extprefix| \ | 48 | -extprefix| \ |
49 | -sysroot| \ | 49 | -sysroot| \ |
50 | @@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do | 50 | @@ -1120,6 +1122,9 @@ while [ "$#" -gt 0 ]; do |
51 | extprefix) | 51 | extprefix) |
52 | QT_EXT_PREFIX="$VAL" | 52 | QT_EXT_PREFIX="$VAL" |
53 | ;; | 53 | ;; |
@@ -57,7 +57,7 @@ index 1b328ae..46f7230 100755 | |||
57 | pkg-config) | 57 | pkg-config) |
58 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 58 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
59 | CFG_PKGCONFIG="$VAL" | 59 | CFG_PKGCONFIG="$VAL" |
60 | @@ -2226,6 +2231,10 @@ Installation options: | 60 | @@ -2236,6 +2241,10 @@ Installation options: |
61 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 61 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
62 | (default HOSTPREFIX) | 62 | (default HOSTPREFIX) |
63 | 63 | ||
@@ -68,7 +68,7 @@ index 1b328ae..46f7230 100755 | |||
68 | Configure options: | 68 | Configure options: |
69 | 69 | ||
70 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 70 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
71 | @@ -3133,6 +3142,11 @@ fi | 71 | @@ -3151,6 +3160,11 @@ fi |
72 | # command line and environment validation | 72 | # command line and environment validation |
73 | #------------------------------------------------------------------------------- | 73 | #------------------------------------------------------------------------------- |
74 | 74 | ||
@@ -80,7 +80,7 @@ index 1b328ae..46f7230 100755 | |||
80 | # update QT_CONFIG to show our current predefined configuration | 80 | # update QT_CONFIG to show our current predefined configuration |
81 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 81 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
82 | case "$CFG_QCONFIG" in | 82 | case "$CFG_QCONFIG" in |
83 | @@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 83 | @@ -3838,6 +3852,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { |
84 | "qt_hbinpath=$QT_HOST_BINS", | 84 | "qt_hbinpath=$QT_HOST_BINS", |
85 | "qt_hlibpath=$QT_HOST_LIBS", | 85 | "qt_hlibpath=$QT_HOST_LIBS", |
86 | "qt_hdatpath=$QT_HOST_DATA", | 86 | "qt_hdatpath=$QT_HOST_DATA", |
@@ -135,7 +135,7 @@ index e50485c..71291ad 100644 | |||
135 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 135 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
136 | }; | 136 | }; |
137 | diff --git a/qtbase.pro b/qtbase.pro | 137 | diff --git a/qtbase.pro b/qtbase.pro |
138 | index 7576db7..d51af0e 100644 | 138 | index 140a137..4e01d5b 100644 |
139 | --- a/qtbase.pro | 139 | --- a/qtbase.pro |
140 | +++ b/qtbase.pro | 140 | +++ b/qtbase.pro |
141 | @@ -70,16 +70,22 @@ CONFIG -= qt | 141 | @@ -70,16 +70,22 @@ CONFIG -= qt |
@@ -198,7 +198,7 @@ index 17864b5..a14bc0f 100644 | |||
198 | HostSpecPath, | 198 | HostSpecPath, |
199 | LastHostPath = HostSpecPath, | 199 | LastHostPath = HostSpecPath, |
200 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 200 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
201 | index e2fef2c..ab475c3 100644 | 201 | index 5ab413a..50a192b 100644 |
202 | --- a/tools/configure/configureapp.cpp | 202 | --- a/tools/configure/configureapp.cpp |
203 | +++ b/tools/configure/configureapp.cpp | 203 | +++ b/tools/configure/configureapp.cpp |
204 | @@ -1186,6 +1186,13 @@ void Configure::parseCmdLine() | 204 | @@ -1186,6 +1186,13 @@ void Configure::parseCmdLine() |
@@ -224,5 +224,5 @@ index e2fef2c..ab475c3 100644 | |||
224 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 224 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
225 | << "#endif" << endl | 225 | << "#endif" << endl |
226 | -- | 226 | -- |
227 | 1.8.5.2 | 227 | 1.8.5.3 |
228 | 228 | ||
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 71a45969..16317ac7 100644 --- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001 | 1 | From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 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 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with |
@@ -10,7 +10,7 @@ Upstream-Status: Pending | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 12 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
13 | index ab475c3..68cd43d 100644 | 13 | index 50a192b..46eabe4 100644 |
14 | --- a/tools/configure/configureapp.cpp | 14 | --- a/tools/configure/configureapp.cpp |
15 | +++ b/tools/configure/configureapp.cpp | 15 | +++ b/tools/configure/configureapp.cpp |
16 | @@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri() | 16 | @@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri() |
@@ -25,5 +25,5 @@ index ab475c3..68cd43d 100644 | |||
25 | configStream << "}" << endl; | 25 | configStream << "}" << endl; |
26 | if (dictionary["QT_EDITION"].contains("OPENSOURCE")) | 26 | if (dictionary["QT_EDITION"].contains("OPENSOURCE")) |
27 | -- | 27 | -- |
28 | 1.8.5.2 | 28 | 1.8.5.3 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch index f85fb33b..833c9b59 100644 --- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 33bbb10c66df59abfad9f4576462f63dfb500149 Mon Sep 17 00:00:00 2001 | 1 | From 1f9449f851f7ec288948ec8e83f2fe4b0b37e789 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 05/14] qt_module: Fix pkgconfig replacement | 4 | Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement |
@@ -33,13 +33,13 @@ Content-Transfer-Encoding: 8bit | |||
33 | 33 | ||
34 | * fix paths in packageconfig files | 34 | * fix paths in packageconfig files |
35 | This reverts parts of: | 35 | This reverts parts of: |
36 | |||
36 | enable path replacement in installed prl files on all platforms | 37 | enable path replacement in installed prl files on all platforms |
38 | |||
37 | Task-number: QTBUG-33794 | 39 | Task-number: QTBUG-33794 |
38 | Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b | 40 | Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b |
39 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> | 41 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> |
40 | 42 | ||
41 | Upstream-Status: Pending | ||
42 | |||
43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
44 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 44 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
45 | --- | 45 | --- |
@@ -113,5 +113,5 @@ index 11509ee..2f95684 100644 | |||
113 | 113 | ||
114 | unix|win32-g++* { | 114 | unix|win32-g++* { |
115 | -- | 115 | -- |
116 | 1.8.5.2 | 116 | 1.8.5.3 |
117 | 117 | ||
diff --git a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 82e028d7..726bfe00 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001 | 1 | From ebd38fc708cf7190e47a75754235f56fa5d86300 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, 8 May 2013 23:54:35 +0200 | 3 | Date: Wed, 8 May 2013 23:54:35 +0200 |
4 | Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars | 4 | Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars |
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 14 deletions(-) | 14 | 1 file changed, 14 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure b/configure | 16 | diff --git a/configure b/configure |
17 | index 46f7230..96c56c8 100755 | 17 | index 7f3f2f0..13dd619 100755 |
18 | --- a/configure | 18 | --- a/configure |
19 | +++ b/configure | 19 | +++ b/configure |
20 | @@ -581,20 +581,6 @@ fi'` | 20 | @@ -581,20 +581,6 @@ fi'` |
@@ -39,5 +39,5 @@ index 46f7230..96c56c8 100755 | |||
39 | mkdir -p "$outpath/config.tests" | 39 | mkdir -p "$outpath/config.tests" |
40 | rm -f "$outpath/config.tests/.qmake.cache" | 40 | rm -f "$outpath/config.tests/.qmake.cache" |
41 | -- | 41 | -- |
42 | 1.8.5.2 | 42 | 1.8.5.3 |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch index b2b5ef9c..e8a7784b 100644 --- a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001 | 1 | From 828eecd8f361cb965bd40f535435efa91665c8e5 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: Thu, 9 May 2013 10:06:50 +0200 | 3 | Date: Thu, 9 May 2013 10:06:50 +0200 |
4 | Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make | 4 | Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make |
@@ -33,5 +33,5 @@ index 39144e7..de48b07 100644 | |||
33 | msg = "test $$1 succeeded" | 33 | msg = "test $$1 succeeded" |
34 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 34 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
35 | -- | 35 | -- |
36 | 1.8.5.2 | 36 | 1.8.5.3 |
37 | 37 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch index eea0c343..cccf7fbe 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch | |||
@@ -1,9 +1,12 @@ | |||
1 | From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001 | 1 | From 3923edc900d1b3dd23e0a6af3a32255707cd497c Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Tue, 28 Feb 2012 15:10:24 +0000 | 3 | Date: Tue, 28 Feb 2012 15:10:24 +0000 |
4 | Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a | 4 | Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a |
5 | configurable option | 5 | configurable option |
6 | 6 | ||
7 | Allows disabling pulseaudio, alsa, freetype support at configure time | ||
8 | making builds more deterministic. | ||
9 | |||
7 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
8 | 11 | ||
9 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 12 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
@@ -13,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
13 | 1 file changed, 21 insertions(+) | 16 | 1 file changed, 21 insertions(+) |
14 | 17 | ||
15 | diff --git a/configure b/configure | 18 | diff --git a/configure b/configure |
16 | index 96c56c8..b3854aa 100755 | 19 | index 13dd619..66c2ae0 100755 |
17 | --- a/configure | 20 | --- a/configure |
18 | +++ b/configure | 21 | +++ b/configure |
19 | @@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do | 22 | @@ -1810,6 +1810,27 @@ while [ "$#" -gt 0 ]; do |
20 | UNKNOWN_OPT=yes | 23 | UNKNOWN_OPT=yes |
21 | fi | 24 | fi |
22 | ;; | 25 | ;; |
@@ -45,5 +48,5 @@ index 96c56c8..b3854aa 100755 | |||
45 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 48 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
46 | CFG_QGTKSTYLE="$VAL" | 49 | CFG_QGTKSTYLE="$VAL" |
47 | -- | 50 | -- |
48 | 1.8.5.2 | 51 | 1.8.5.3 |
49 | 52 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch index b35597b7..23e22a89 100644 --- a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch +++ b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001 | 1 | From acbd622d1b91c1aa9ec8c48d10d91354d175345c Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Mon, 22 Jul 2013 21:09:41 +0000 | 3 | Date: Mon, 22 Jul 2013 21:09:41 +0000 |
4 | Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to | 4 | Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to |
@@ -15,7 +15,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
15 | 3 files changed, 6 insertions(+), 6 deletions(-) | 15 | 3 files changed, 6 insertions(+), 6 deletions(-) |
16 | 16 | ||
17 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 17 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
18 | index 1e00c74..a99b5bf 100644 | 18 | index 9bda70e..6e3605a 100644 |
19 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 19 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
20 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 20 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
21 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 21 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
@@ -46,7 +46,7 @@ index 1e00c74..a99b5bf 100644 | |||
46 | _qt5_Core_check_file_exists(${imported_location}) | 46 | _qt5_Core_check_file_exists(${imported_location}) |
47 | 47 | ||
48 | diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in | 48 | diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in |
49 | index 1d94715..301af8f 100644 | 49 | index 1d94715..617efa8 100644 |
50 | --- a/src/dbus/Qt5DBusConfigExtras.cmake.in | 50 | --- a/src/dbus/Qt5DBusConfigExtras.cmake.in |
51 | +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in | 51 | +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in |
52 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) | 52 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) |
@@ -81,5 +81,5 @@ index e5650ff..16ff007 100644 | |||
81 | _qt5_Widgets_check_file_exists(${imported_location}) | 81 | _qt5_Widgets_check_file_exists(${imported_location}) |
82 | 82 | ||
83 | -- | 83 | -- |
84 | 1.8.5.2 | 84 | 1.8.5.3 |
85 | 85 | ||
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch index 91370f17..5681b583 100644 --- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba Mon Sep 17 00:00:00 2001 | 1 | From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 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 10/12] Always build uic | 4 | Subject: [PATCH 10/12] Always build uic |
@@ -34,5 +34,5 @@ index b7887a6..8801544 100644 | |||
34 | \ No newline at end of file | 34 | \ No newline at end of file |
35 | +QMAKE_EXTRA_TARGETS = sub-tools | 35 | +QMAKE_EXTRA_TARGETS = sub-tools |
36 | -- | 36 | -- |
37 | 1.8.5.2 | 37 | 1.8.5.3 |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch index 1b1d85e3..64ba88e7 100644 --- a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001 | 1 | From 77a18a9fe2d0e4a1dcd95e2d78c85eb37452bc73 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 10/14] qmake is already built in qtbase-native | 4 | Subject: [PATCH 10/14] qmake is already built in qtbase-native |
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
16 | index b3854aa..15c89c7 100755 | 16 | index 66c2ae0..ac836aa 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -3923,7 +3923,7 @@ setBootstrapEvalVariable() | 19 | @@ -3941,7 +3941,7 @@ setBootstrapEvalVariable() |
20 | 20 | ||
21 | 21 | ||
22 | # build qmake | 22 | # build qmake |
@@ -26,5 +26,5 @@ index b3854aa..15c89c7 100755 | |||
26 | 26 | ||
27 | mkdir -p "$outpath/qmake" || exit | 27 | mkdir -p "$outpath/qmake" || exit |
28 | -- | 28 | -- |
29 | 1.8.5.2 | 29 | 1.8.5.3 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch index 65b65aa7..f80edbd9 100644 --- a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001 | 1 | From dd14f3eda61669c66c95dbcbca3afbd61f9aa746 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 | 3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 |
4 | Subject: [PATCH 11/14] Allow building a separate qmake for the target | 4 | Subject: [PATCH 11/14] Allow building a separate qmake for the target |
@@ -26,5 +26,5 @@ index 89d6ea5..7c605b9 100644 | |||
26 | VPATH += \ | 26 | VPATH += \ |
27 | ../src/corelib/global \ | 27 | ../src/corelib/global \ |
28 | -- | 28 | -- |
29 | 1.8.5.2 | 29 | 1.8.5.3 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch index 9335610d..798cd45e 100644 --- a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001 | 1 | From 441b2ebc41013505b9f5b6a4db43526506f84e47 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | 3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 |
4 | Subject: [PATCH 11/12] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 11/12] configure: preserve built qmake and swap with native |
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
13 | 1 file changed, 2 insertions(+) | 13 | 1 file changed, 2 insertions(+) |
14 | 14 | ||
15 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
16 | index b3854aa..20836a6 100755 | 16 | index 66c2ae0..d423cce 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 19 | @@ -4085,6 +4085,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
20 | 20 | ||
21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 | 21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 |
22 | fi # Build qmake | 22 | fi # Build qmake |
@@ -26,5 +26,5 @@ index b3854aa..20836a6 100755 | |||
26 | echo "Running configuration tests..." | 26 | echo "Running configuration tests..." |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 1.8.5.2 | 29 | 1.8.5.3 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch index d235797d..be86f71d 100644 --- a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001 | 1 | From 63313ba681ad5bb0ef83c3b8908387939c2b41d5 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | 3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 |
4 | Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters |
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
15 | index 20836a6..50661f4 100755 | 15 | index d423cce..1ea4102 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -3805,7 +3805,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 18 | @@ -3823,7 +3823,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ |
19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; | 19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; |
20 | 20 | ||
21 | /* Installation Info */ | 21 | /* Installation Info */ |
@@ -25,5 +25,5 @@ index 20836a6..50661f4 100755 | |||
25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", | 25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", |
26 | "qt_docspath=$QT_SYSROOT_DOCS", | 26 | "qt_docspath=$QT_SYSROOT_DOCS", |
27 | -- | 27 | -- |
28 | 1.8.5.2 | 28 | 1.8.5.3 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch index 591be8e5..9d46d2fb 100644 --- a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001 | 1 | From 6e5e22110b4731b4324d309bc579393f422ba99d 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: Sat, 25 May 2013 17:34:32 +0200 | 3 | Date: Sat, 25 May 2013 17:34:32 +0200 |
4 | Subject: [PATCH 12/14] qtbase: allow build of examples | 4 | Subject: [PATCH 12/14] qtbase: allow build of examples |
@@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644 | |||
44 | - } | 44 | - } |
45 | } | 45 | } |
46 | -- | 46 | -- |
47 | 1.8.5.2 | 47 | 1.8.5.3 |
48 | 48 | ||
diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch index 9bef55af..c6ec67cb 100644 --- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf Mon Sep 17 00:00:00 2001 | 1 | From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 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 13/14] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support |
@@ -150,5 +150,5 @@ index 3b62d1d..a5d1f7e 100644 | |||
150 | } else { | 150 | } else { |
151 | m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); | 151 | m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); |
152 | -- | 152 | -- |
153 | 1.8.5.2 | 153 | 1.8.5.3 |
154 | 154 | ||
diff --git a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch deleted file mode 100644 index 5b5d18f0..00000000 --- a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Mon, 27 May 2013 18:32:37 +0200 | ||
4 | Subject: [PATCH 14/14] enables tslib device to be read from env variable | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | from : | ||
10 | https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch | ||
11 | |||
12 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | src/plugins/generic/tslib/qtslib.cpp | 4 +++- | ||
16 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp | ||
19 | index 6986fd5..2ed4a69 100644 | ||
20 | --- a/src/plugins/generic/tslib/qtslib.cpp | ||
21 | +++ b/src/plugins/generic/tslib/qtslib.cpp | ||
22 | @@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, | ||
23 | qDebug() << "QTsLibMouseHandler" << key << specification; | ||
24 | setObjectName(QLatin1String("TSLib Mouse Handler")); | ||
25 | |||
26 | - QByteArray device = "/dev/input/event1"; | ||
27 | + QByteArray device = qgetenv("TSLIB_TSDEVICE"); | ||
28 | + if(device.isEmpty()) | ||
29 | + device = "/dev/input/event1"; | ||
30 | if (specification.startsWith("/dev/")) | ||
31 | device = specification.toLocal8Bit(); | ||
32 | |||
33 | -- | ||
34 | 1.8.5.2 | ||
35 | |||
diff --git a/recipes-qt/qt5/qtbase_5.2.0.bb b/recipes-qt/qt5/qtbase_5.2.0.bb deleted file mode 100644 index aca8dea0..00000000 --- a/recipes-qt/qt5/qtbase_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1" | ||
5 | SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628" | ||
diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb new file mode 100644 index 00000000..c106d227 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" | ||
5 | SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index bd8a6f69..4d55dbe6 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" | 4 | SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0" |
diff --git a/recipes-qt/qt5/qtconnectivity_5.2.1.bb b/recipes-qt/qt5/qtconnectivity_5.2.1.bb new file mode 100644 index 00000000..6fd0c7ba --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "cb2ef624b28b6ba61d6a467b8b3c314a" | ||
5 | SRC_URI[sha256sum] = "ec31e1c3cd5aea4d7dff946802a7fde2599bb8a1931d4bb49cb0854371cf1223" | ||
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 4373e5ea..cca309b9 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${BPN}.inc | 2 | require ${BPN}.inc |
3 | 3 | ||
4 | SRCREV = "3016e7fb6d5e00616fa75d2d2eeafa266382f953" | 4 | SRCREV = "2f2985b03f5202a9ab329f89de7317585af8c250" |
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index 7a68dd53..f1393785 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 | 1 | From 6e3f95ab76c4de1333eab1625b507c09ad52d340 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 1/3] qmltestexample: fix link | 4 | Subject: [PATCH 1/2] qmltestexample: fix link |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -13,9 +13,8 @@ Upstream-Status: Inappropriate | |||
13 | 13 | ||
14 | Signed-off-by: Eric Bénard <eric@eukrea.com> | 14 | Signed-off-by: Eric Bénard <eric@eukrea.com> |
15 | --- | 15 | --- |
16 | examples/qmltest/qmltest/qmltest.pro | 2 +- | 16 | examples/qmltest/qmltest/qmltest.pro | 2 +- |
17 | tools/qmltestrunner/qmltestrunner.pro | 2 +- | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | 18 | ||
20 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro | 19 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro |
21 | index b5893c5..1b00e6c 100644 | 20 | index b5893c5..1b00e6c 100644 |
@@ -42,5 +41,5 @@ index 5184c1f..668cf17 100644 | |||
42 | 41 | ||
43 | load(qt_tool) | 42 | load(qt_tool) |
44 | -- | 43 | -- |
45 | 1.8.3.2 | 44 | 1.8.5.3 |
46 | 45 | ||
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch index 84f8f661..5643634c 100644 --- a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 | 1 | From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> | 2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> |
3 | Date: Wed, 5 Jun 2013 19:23:32 +0200 | 3 | Date: Wed, 5 Jun 2013 19:23:32 +0200 |
4 | Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions | 4 | Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions |
@@ -24,10 +24,10 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe | |||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp | 26 | diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp |
27 | index a6dabee..290f283 100644 | 27 | index d7b9847..a54d282 100644 |
28 | --- a/src/quick/items/qquickitemview.cpp | 28 | --- a/src/quick/items/qquickitemview.cpp |
29 | +++ b/src/quick/items/qquickitemview.cpp | 29 | +++ b/src/quick/items/qquickitemview.cpp |
30 | @@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() | 30 | @@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout() |
31 | 31 | ||
32 | prepareVisibleItemTransitions(); | 32 | prepareVisibleItemTransitions(); |
33 | 33 | ||
@@ -37,5 +37,5 @@ index a6dabee..290f283 100644 | |||
37 | it != releasePendingTransition.end(); ) { | 37 | it != releasePendingTransition.end(); ) { |
38 | FxViewItem *item = *it; | 38 | FxViewItem *item = *it; |
39 | -- | 39 | -- |
40 | 1.8.3.2 | 40 | 1.8.5.3 |
41 | 41 | ||
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.0.bb b/recipes-qt/qt5/qtdeclarative_5.2.0.bb deleted file mode 100644 index a88f50f2..00000000 --- a/recipes-qt/qt5/qtdeclarative_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "0f7714c5c91b8eb7cdc1071f0a51c202" | ||
5 | SRC_URI[sha256sum] = "b81bd480216fda8ff1d96610e710ff5ca17e0d711c8e40753264f91a4e8f6d19" | ||
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb new file mode 100644 index 00000000..8e435cf6 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc" | ||
5 | SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690" | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 9190800c..1b9decd3 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "f95fdacb3a12e4f0d37d3c32b34326f2bd1536de" | 4 | QT_MODULE_BRANCH = "release" |
5 | SRCREV = "96e4f00db3bfd222146780251013501cfdd8baaa" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb deleted file mode 100644 index df36dc6a..00000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "85e94989bbc624f676102f0ea343b6dd" | ||
5 | SRC_URI[sha256sum] = "b28cefa95578cf5ed1dfcbc81da1cbec427400e56edf0ce81323b3f25e2a558d" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb new file mode 100644 index 00000000..4d5673b9 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "8dde8593750e33a79f49c5a2f03caf0c" | ||
5 | SRC_URI[sha256sum] = "5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index c1bd9fad..2f964fe6 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "c640a496d63036ead177dd006ef56b9b12d962bb" | 4 | SRCREV = "740fbcf28012ade59087df945b4c6b8ae05b7a68" |
diff --git a/recipes-qt/qt5/qtimageformats_5.2.0.bb b/recipes-qt/qt5/qtimageformats_5.2.0.bb deleted file mode 100644 index a12e5d8b..00000000 --- a/recipes-qt/qt5/qtimageformats_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "fe9898272b3952e3d97eacbaca484b55" | ||
5 | SRC_URI[sha256sum] = "632aacdac40717bf1bbc6861dc2e2d7d2825d68f40b7c1ae04636dafa20b0210" | ||
diff --git a/recipes-qt/qt5/qtimageformats_5.2.1.bb b/recipes-qt/qt5/qtimageformats_5.2.1.bb new file mode 100644 index 00000000..2d24ce75 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "9b88aa6f3888c7c7f5253c147ae4bf8f" | ||
5 | SRC_URI[sha256sum] = "a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124" | ||
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 856bfba7..8a39e2d7 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "d507c358b803cd40ec13ed19e00eced80b732571" | 4 | SRCREV = "8548d1fe0985b3b680acef3135646aa4e876175c" |
diff --git a/recipes-qt/qt5/qtlocation_5.2.1.bb b/recipes-qt/qt5/qtlocation_5.2.1.bb new file mode 100644 index 00000000..f920e2c7 --- /dev/null +++ b/recipes-qt/qt5/qtlocation_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4de8ca8ac1a3e5db20a903286fb78840" | ||
5 | SRC_URI[sha256sum] = "9543fcdcab5cf02be60e395e8145e1ec87d03a3d1f129a0dde92102283a9b536" | ||
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index d5d7e844..e1af5fb7 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "c4d3b333a1ec0de5ef1389569b9b65467453e382" | 4 | SRCREV = "a74b31c16b4baeeb8047e1958eb1b6787dc885e8" |
diff --git a/recipes-qt/qt5/qtmultimedia_5.2.0.bb b/recipes-qt/qt5/qtmultimedia_5.2.0.bb deleted file mode 100644 index 9f3f5b1a..00000000 --- a/recipes-qt/qt5/qtmultimedia_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "2d0f9403f607f617bcc13d4814f41365" | ||
5 | SRC_URI[sha256sum] = "dc37d21db1d4d8cdc2808ee24c7354643bc0b2ff71f9631bd8cfded388a4d9ac" | ||
diff --git a/recipes-qt/qt5/qtmultimedia_5.2.1.bb b/recipes-qt/qt5/qtmultimedia_5.2.1.bb new file mode 100644 index 00000000..fc823a6d --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "26dc22c59fbbad9fdf0699d5f887166a" | ||
5 | SRC_URI[sha256sum] = "62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2" | ||
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 8ba720f1..6e87fb37 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "ea9f9788d502d4a4307a464d87a00be198df09ad" | 4 | SRCREV = "658ad524f8ba9cbcae797aefbdf498ef9d364067" |
diff --git a/recipes-qt/qt5/qtquick1_5.2.0.bb b/recipes-qt/qt5/qtquick1_5.2.0.bb deleted file mode 100644 index bc3df43f..00000000 --- a/recipes-qt/qt5/qtquick1_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4535ff78b5a9a18ffba702298a48e22e" | ||
5 | SRC_URI[sha256sum] = "ae868892a586cd0622a558fda6ebada8edadb575edf3b50e5569fd7115b6e805" | ||
diff --git a/recipes-qt/qt5/qtquick1_5.2.1.bb b/recipes-qt/qt5/qtquick1_5.2.1.bb new file mode 100644 index 00000000..7563bc6b --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "6abbf131adffdf3cba63704d5d35f921" | ||
5 | SRC_URI[sha256sum] = "8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65" | ||
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 1a83f108..636c4c91 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "2866c00375313d1726cc0473b6b7bfc87b984c78" | 4 | SRCREV = "3384daf6d1ab1fc15908866e2743f060a7461daa" |
diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.0.bb b/recipes-qt/qt5/qtquickcontrols_5.2.0.bb deleted file mode 100644 index 99c5bc0c..00000000 --- a/recipes-qt/qt5/qtquickcontrols_5.2.0.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "748ab947f59fb104db2ac1fefa073d81" | ||
5 | SRC_URI[sha256sum] = "c778c364d8d438ff7939c540f56ea741e4b5b957b620b194c2e881c775ab582c" | ||
6 | |||
diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb new file mode 100644 index 00000000..2c09e440 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "027bc7d05fe740b21284dc909c9f11ac" | ||
5 | SRC_URI[sha256sum] = "eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac" | ||
6 | |||
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 76f96ea4..be0fbba0 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "1d684b38a4fb0b8ce33401fa9c8f415eba6097bf" | 4 | SRCREV = "c7540702126251ca5f7cc78e685b970d06e48ce8" |
diff --git a/recipes-qt/qt5/qtscript_5.2.0.bb b/recipes-qt/qt5/qtscript_5.2.0.bb deleted file mode 100644 index c477d9ec..00000000 --- a/recipes-qt/qt5/qtscript_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "37d32c983c3fdf5b29f932265046f2e3" | ||
5 | SRC_URI[sha256sum] = "ea717e633c9a586dc66b435aad50c9870d6f0c4d1bc185f91144b002bd060294" | ||
diff --git a/recipes-qt/qt5/qtscript_5.2.1.bb b/recipes-qt/qt5/qtscript_5.2.1.bb new file mode 100644 index 00000000..4617c09e --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "b8af09bb297d4c62e64df5418fe99dc9" | ||
5 | SRC_URI[sha256sum] = "6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa" | ||
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index fd98b672..dd9b3a81 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "15bb30b0e90c628cc3812627923d1d459d461505" | 4 | SRCREV = "3aadb5c9894d5fe92923cc6c5dd2a71949a49927" |
diff --git a/recipes-qt/qt5/qtsensors_5.2.0.bb b/recipes-qt/qt5/qtsensors_5.2.0.bb deleted file mode 100644 index 7eabd189..00000000 --- a/recipes-qt/qt5/qtsensors_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "718606a6f76afa20c6cd2e0433356ac2" | ||
5 | SRC_URI[sha256sum] = "5934651affead2b7e70fd7a3dedcbfbf7ef3d7b64a9ac4142622f7afff578446" | ||
diff --git a/recipes-qt/qt5/qtsensors_5.2.1.bb b/recipes-qt/qt5/qtsensors_5.2.1.bb new file mode 100644 index 00000000..1f340d0d --- /dev/null +++ b/recipes-qt/qt5/qtsensors_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "045f98acba9fba0358a6a50356be0841" | ||
5 | SRC_URI[sha256sum] = "09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407" | ||
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index db5f8169..767655f9 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "8b501195f623fbcf31b591a1414e1726dbb7ce84" | 4 | SRCREV = "832136829ece18885ef7ac35f4527d1d314aaea8" |
diff --git a/recipes-qt/qt5/qtserialport_5.2.0.bb b/recipes-qt/qt5/qtserialport_5.2.0.bb deleted file mode 100644 index 03dae6c0..00000000 --- a/recipes-qt/qt5/qtserialport_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "7b90e0707b698331226e662bd39945e9" | ||
5 | SRC_URI[sha256sum] = "c7d5bb58d6c574275102d088159d0323aac40a639ceb4224aa06c34d2fe8d292" | ||
diff --git a/recipes-qt/qt5/qtserialport_5.2.1.bb b/recipes-qt/qt5/qtserialport_5.2.1.bb new file mode 100644 index 00000000..806e7eee --- /dev/null +++ b/recipes-qt/qt5/qtserialport_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "2993ad7e92a0b6b41e3cb0e0e345d251" | ||
5 | SRC_URI[sha256sum] = "f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347" | ||
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index af2cf22b..028c77fa 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "97bbe2acd8b4c14315653a3d9dc5757d6518220e" | 4 | QT_MODULE_BRANCH = "release" |
5 | SRCREV = "29e526ad5c1e2fe0996ba0a776d83ec86f7197d7" | ||
diff --git a/recipes-qt/qt5/qtsvg_5.2.0.bb b/recipes-qt/qt5/qtsvg_5.2.0.bb deleted file mode 100644 index e300b4c8..00000000 --- a/recipes-qt/qt5/qtsvg_5.2.0.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "3f6132475f6edcd7b6cfb57650846185" | ||
5 | SRC_URI[sha256sum] = "bad23ebcebf8e91cc727b229a3f87f95829edfd2a7653d47e97b154aac687c59" | ||
6 | |||
diff --git a/recipes-qt/qt5/qtsvg_5.2.1.bb b/recipes-qt/qt5/qtsvg_5.2.1.bb new file mode 100644 index 00000000..d12bd838 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.2.1.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "3f5487fe2bd5024f18f63a8d0eb4294d" | ||
5 | SRC_URI[sha256sum] = "788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef" | ||
6 | |||
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index a727e833..986b0c10 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "b719b93770393bbf20251e1dffc70498061e612c" | 4 | SRCREV = "ef1c298cc27e15dd6f6bba95b605471d95bead6b" |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 80c9309d..78533553 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 4 | # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
5 | # # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0 | 5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 |
6 | 6 | ||
7 | QT_MODULE_BRANCH = "dev" | 7 | QT_MODULE_BRANCH = "dev" |
8 | 8 | ||
9 | SRCREV = "d6104a92321c2e72b140156fddf0378c9795cdb4" | 9 | SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102" |
diff --git a/recipes-qt/qt5/qttools-native_5.2.0.bb b/recipes-qt/qt5/qttools-native_5.2.0.bb deleted file mode 100644 index 0effa1bf..00000000 --- a/recipes-qt/qt5/qttools-native_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" | ||
5 | SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" | ||
diff --git a/recipes-qt/qt5/qttools-native_5.2.1.bb b/recipes-qt/qt5/qttools-native_5.2.1.bb new file mode 100644 index 00000000..d186a213 --- /dev/null +++ b/recipes-qt/qt5/qttools-native_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" | ||
5 | SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" | ||
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index 72006ed8..77c5a8d6 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "a60aa90f5ca00e32a1271a476f5da650dddebfda" | 4 | SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb" |
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 ec82bb94..49f296d8 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,7 +1,7 @@ | |||
1 | From a4af5dd2b0449df19271b22a62a03f70598106f0 Mon Sep 17 00:00:00 2001 | 1 | From a5150c9701d5b2e6c77e521544034ea732d2266b 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 1/2] Allow to build only lrelease + lupdate + lconvert |
5 | 5 | ||
6 | This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native | 6 | This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native |
7 | is built without GUI support (no-png is set) and we still want to build | 7 | is built without GUI support (no-png is set) and we still want to build |
@@ -134,5 +134,5 @@ index eaf440b..1778ad1 100644 | |||
134 | installed_cmake.depends = cmake | 134 | installed_cmake.depends = cmake |
135 | 135 | ||
136 | -- | 136 | -- |
137 | 1.8.4.3 | 137 | 1.8.5.3 |
138 | 138 | ||
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 0f953338..3e4cf4ef 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,7 +1,7 @@ | |||
1 | From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001 | 1 | From 6837c212d388a3b679b7420c5f1c98ef85d04a39 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 2/2] assistant/help: fix linking of dependent libraries |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -28,5 +28,5 @@ index ed75c37..a2c55c7 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 1.8.3.1 | 31 | 1.8.5.3 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qttools_5.2.0.bb b/recipes-qt/qt5/qttools_5.2.0.bb deleted file mode 100644 index 0effa1bf..00000000 --- a/recipes-qt/qt5/qttools_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1" | ||
5 | SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0" | ||
diff --git a/recipes-qt/qt5/qttools_5.2.1.bb b/recipes-qt/qt5/qttools_5.2.1.bb new file mode 100644 index 00000000..d186a213 --- /dev/null +++ b/recipes-qt/qt5/qttools_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" | ||
5 | SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" | ||
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb new file mode 100644 index 00000000..77c5a8d6 --- /dev/null +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | require qt5-git.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb" | ||
diff --git a/recipes-qt/qt5/qtwayland-native.inc b/recipes-qt/qt5/qtwayland-native.inc index 4aa82c36..78416e89 100644 --- a/recipes-qt/qt5/qtwayland-native.inc +++ b/recipes-qt/qt5/qtwayland-native.inc | |||
@@ -1,10 +1,5 @@ | |||
1 | require qt5-native.inc | 1 | require qt5-native.inc |
2 | 2 | ||
3 | LICENSE = "BSD & LGPL-2.1 | GPL-3.0" | ||
4 | LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ | ||
5 | file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \ | ||
6 | " | ||
7 | |||
8 | QT_MODULE = "${BPN}" | 3 | QT_MODULE = "${BPN}" |
9 | 4 | ||
10 | DEPENDS = "qtbase-native wayland-native" | 5 | DEPENDS = "qtbase-native wayland-native" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 2ffaff61..988aa98b 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -2,7 +2,6 @@ require qt5-git.inc | |||
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
5 | # this PV is only to indicate that this recipe is compatible with qt5 5.2.0 | 5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 |
6 | PV = "5.2.0+git${SRCPV}" | ||
7 | 6 | ||
8 | SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5" | 7 | SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e" |
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index eec26b67..29c6b276 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc | |||
@@ -1,10 +1,5 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | LICENSE = "BSD & LGPL-2.1 | GPL-3.0" | ||
4 | LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ | ||
5 | file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \ | ||
6 | " | ||
7 | |||
8 | # wayland-native is already in wayland DEPENDS, but add it here | 3 | # wayland-native is already in wayland DEPENDS, but add it here |
9 | # explicitly, because it's native wayland-scanner we're looking for | 4 | # explicitly, because it's native wayland-scanner we're looking for |
10 | # libxkbcommon isn't mandatory make it easier to remove by .bbappend | 5 | # libxkbcommon isn't mandatory make it easier to remove by .bbappend |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 640373e0..988aa98b 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -2,6 +2,6 @@ require qt5-git.inc | |||
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0 | 5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 |
6 | 6 | ||
7 | SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5" | 7 | SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e" |
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb deleted file mode 100644 index 93487363..00000000 --- a/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "8431a8476213b3a3587e04b023a2435f" | ||
5 | SRC_URI[sha256sum] = "80e7eb55ea6c4a4e92f44eb1d3cd7c9ecd85f9d5e48e682a31473633fa46a64e" | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb new file mode 100644 index 00000000..c16f91cd --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "ddad7d00ebd201a750242bd67b20ecf3" | ||
5 | SRC_URI[sha256sum] = "d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5" | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 582833e1..0cc5fbfe 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "634cddbfef6a40b991bcdf8e68e5329747f43c57" | 4 | SRCREV = "0d6e9989eb2a15d130b2a132ddc196835a33c9b6" |
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index f2b678ea..aea9dad0 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc | |||
@@ -14,7 +14,7 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" | |||
14 | # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe | 14 | # remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe |
15 | PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " | 15 | PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " |
16 | 16 | ||
17 | SRC_URI += "file://fix-rpath.patch" | 17 | SRC_URI += "file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch" |
18 | 18 | ||
19 | # make sure rb files are used from sysroot, not from host | 19 | # make sure rb files are used from sysroot, not from host |
20 | # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` | 20 | # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` |
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 new file mode 100644 index 00000000..07e4436e --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 89c132829d1a93d662f617c2a7be75c5e6eaa33a Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | ||
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | ||
4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) | ||
5 | |||
6 | Building qtwebkit causes a QA issue such that QtWebPluginProcess and | ||
7 | QtWebProcess contain bad RPATHs which point into the build location. This fix | ||
8 | adds a patch to not include the rpath.prf which causes this problem. | ||
9 | |||
10 | Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- | ||
14 | 1 file changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
17 | index 79b7208..6dff72b 100644 | ||
18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
20 | @@ -58,8 +58,6 @@ linux-*g++* { | ||
21 | QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions | ||
22 | } | ||
23 | |||
24 | -contains(TEMPLATE, app): CONFIG += rpath | ||
25 | - | ||
26 | CONFIG(debug, debug|release)|force_debug_info|separate_debug_info { | ||
27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | ||
28 | !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory | ||
29 | -- | ||
30 | 1.8.5.3 | ||
31 | |||
diff --git a/recipes-qt/qt5/qtwebkit/fix-rpath.patch b/recipes-qt/qt5/qtwebkit/fix-rpath.patch deleted file mode 100644 index 5c205144..00000000 --- a/recipes-qt/qt5/qtwebkit/fix-rpath.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
2 | =================================================================== | ||
3 | --- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
4 | +++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf | ||
5 | @@ -32,8 +32,6 @@ linux-*g++* { | ||
6 | QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions | ||
7 | } | ||
8 | |||
9 | -contains(TEMPLATE, app): CONFIG += rpath | ||
10 | - | ||
11 | isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) { | ||
12 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | ||
13 | config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory | ||
diff --git a/recipes-qt/qt5/qtwebkit_5.2.0.bb b/recipes-qt/qt5/qtwebkit_5.2.0.bb deleted file mode 100644 index 1e16a89a..00000000 --- a/recipes-qt/qt5/qtwebkit_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "1378e18aecd8cc223deb729c8f0a735d" | ||
5 | SRC_URI[sha256sum] = "390e16e719e41bcc94fd79866a0909b70235513778063c5e47227b8b9876e0cf" | ||
diff --git a/recipes-qt/qt5/qtwebkit_5.2.1.bb b/recipes-qt/qt5/qtwebkit_5.2.1.bb new file mode 100644 index 00000000..ef166f22 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "a20d99a1c2afbd6a7c6f54e615f1bd63" | ||
5 | SRC_URI[sha256sum] = "ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c" | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index af8598a6..8ba7145c 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "4c86230bfe563ef1e3ef493b870203761bc9f32d" | 4 | SRCREV = "3dd07419f3f627ffd0a9efc3f7253cef145f14e5" |
diff --git a/recipes-qt/qt5/qtx11extras_5.2.0.bb b/recipes-qt/qt5/qtx11extras_5.2.0.bb deleted file mode 100644 index 75ba58cd..00000000 --- a/recipes-qt/qt5/qtx11extras_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "1a11c4bb67503e2a5ef10b96bbe11b61" | ||
5 | SRC_URI[sha256sum] = "98e4d82a6e349fb6f4cba29a37d74b9955db340772c8d8810617a85fbb10eec4" | ||
diff --git a/recipes-qt/qt5/qtx11extras_5.2.1.bb b/recipes-qt/qt5/qtx11extras_5.2.1.bb new file mode 100644 index 00000000..b619a4d5 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "ad94a2f14afc3f2dfe9743027860c28a" | ||
5 | SRC_URI[sha256sum] = "4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9" | ||
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index ec4054eb..d6f82c0c 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "120c2267e1960c03a22531c2d5bfe1d87d401ad9" | 4 | SRCREV = "766eaface63b98a248d49d6b70f367e9eebb8f95" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb deleted file mode 100644 index dede57b7..00000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "7c3e94cd04603c3f81e50d47daf5bbc7" | ||
5 | SRC_URI[sha256sum] = "a8192ee70d8d3e9944a8d8f03521e3abf6beb7f6de1bf2d80871dfc4d9bd2a2a" | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb new file mode 100644 index 00000000..ab5570c0 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "d01c6b837db4a6dee69a3f0352b37e18" | ||
5 | SRC_URI[sha256sum] = "bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2" | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8d357460..a51e6c1a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "97f266a006d82cc8554915cba6bf767b93d71a06" | 4 | SRCREV = "f73a75f92a2e6036bbc183d7f63bfd8f42e8abc6" |