diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 14:50:16 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 13:08:53 +0200 |
commit | 89038bffd224a0d43aa8627472374503b3023f61 (patch) | |
tree | f618d1b35f469cb667619274989748b0d5e2c0c1 /recipes-qt/qt5/qtbase | |
parent | 37693b5357e790665bce4957cb7a8d5d2423390d (diff) | |
download | meta-qt5-89038bffd224a0d43aa8627472374503b3023f61.tar.gz |
qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethro
* this is probably last upgrade for jethro branch, master will switch
to 5.6 soon
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
11 files changed, 22 insertions, 22 deletions
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 91bb9f33..a9c448dc 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 566de5f3f4dc14bae25a1b77eb6859c820447a32 Mon Sep 17 00:00:00 2001 | 1 | From 76283f2bca936a7565e8bf38a4630ec98f47ef50 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/10] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/10] Add linux-oe-g++ platform |
@@ -350,5 +350,5 @@ index 0000000..dd12003 | |||
350 | + | 350 | + |
351 | +#endif // QPLATFORMDEFS_H | 351 | +#endif // QPLATFORMDEFS_H |
352 | -- | 352 | -- |
353 | 2.5.3 | 353 | 2.6.1 |
354 | 354 | ||
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 800d42a8..c5f14c9d 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 9e987abf08c5841fcce3331aceec51e00a26dcc8 Mon Sep 17 00:00:00 2001 | 1 | From f15c77264cc3ee82cba4127e58be4f6401b791f6 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/10] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside |
@@ -35,5 +35,5 @@ index 0cfcc4e..c3b5c2d 100644 | |||
35 | return new QSettings(qtconfig, QSettings::IniFormat); | 35 | return new QSettings(qtconfig, QSettings::IniFormat); |
36 | #ifdef QT_BUILD_QMAKE | 36 | #ifdef QT_BUILD_QMAKE |
37 | -- | 37 | -- |
38 | 2.5.3 | 38 | 2.6.1 |
39 | 39 | ||
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 de8e1a4d..e969f6fa 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 90f3f8f59dd23f67e14c9988c2f4449a31762752 Mon Sep 17 00:00:00 2001 | 1 | From 9529fdce0bd5516f86de1cb18aa6d18a66317ba5 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/10] Add -external-hostbindir option | 4 | Subject: [PATCH 03/10] Add -external-hostbindir option |
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 | |||
225 | _qt5_Widgets_check_file_exists(${imported_location}) | 225 | _qt5_Widgets_check_file_exists(${imported_location}) |
226 | 226 | ||
227 | -- | 227 | -- |
228 | 2.5.3 | 228 | 2.6.1 |
229 | 229 | ||
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 e7155bb8..b2cf522b 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 d28d15f9489ab9bb09627014003ad1bde2a79e1f Mon Sep 17 00:00:00 2001 | 1 | From b6d708efc205f2ffc0280e2da94596384bd98049 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 04/10] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements |
@@ -108,5 +108,5 @@ index c89b6d2..23d4366 100644 | |||
108 | } | 108 | } |
109 | 109 | ||
110 | -- | 110 | -- |
111 | 2.5.3 | 111 | 2.6.1 |
112 | 112 | ||
diff --git a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 0875bd88..64f29a58 100644 --- a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c3f540be8541f71fdb7b7baa9000583a914ac7f7 Mon Sep 17 00:00:00 2001 | 1 | From 168690a50a5d8bb1068d254532710cec8c93a08f 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, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h |
@@ -26,5 +26,5 @@ index 42fbf8c..8950f2d 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformWindow; | 27 | class QEGLPlatformWindow; |
28 | -- | 28 | -- |
29 | 2.5.3 | 29 | 2.6.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch index 0635a2f5..6fd8b2be 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 37aec78ac44bad8754c3bd5b56836025e4eed50a Mon Sep 17 00:00:00 2001 | 1 | From 3c6cdb9c315e8457b8d191c0f1192499e8edc009 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 06/10] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 06/10] configure: bump path length from 256 to 512 characters |
@@ -32,5 +32,5 @@ index a757ce5..f0f42ab 100755 | |||
32 | 32 | ||
33 | static const short qt_configure_str_offsets[] = { | 33 | static const short qt_configure_str_offsets[] = { |
34 | -- | 34 | -- |
35 | 2.5.3 | 35 | 2.6.1 |
36 | 36 | ||
diff --git a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch index e2d21155..28ecfd50 100644 --- a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ca3b8fabcc38a9545e935a7c530565689fb85ff7 Mon Sep 17 00:00:00 2001 | 1 | From d68aa317015ca452b7097b267e5a1fa576aaa5e8 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 07/10] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 07/10] QOpenGLPaintDevice sub-area support |
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.5.3 | 156 | 2.6.1 |
157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch index d84e298b..b2a478dc 100644 --- a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d1feb6d0a80460e66872749d931cddc8ed22851d Mon Sep 17 00:00:00 2001 | 1 | From cbd61cc5f4c447a9539e0a6a1dd378ac34471aff 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 08/10] Always build uic | 4 | Subject: [PATCH 08/10] Always build uic |
@@ -27,5 +27,5 @@ index 61e5ce2..a4047aa 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.5.3 | 30 | 2.6.1 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 9bc13157..3ba66415 100644 --- a/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dcc588b11abdc12b4ed08534334e338f35d96ed1 Mon Sep 17 00:00:00 2001 | 1 | From 3442aad5295956c1a177bdf7ab73e1f0d86ab5fc 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 08/10] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 08/10] qmake: don't build it in configure, but allow to build |
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644 | |||
64 | VPATH += \ | 64 | VPATH += \ |
65 | ../src/corelib/global \ | 65 | ../src/corelib/global \ |
66 | -- | 66 | -- |
67 | 2.5.3 | 67 | 2.6.1 |
68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch index 292ced81..683cf271 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 22c6746515470bab482b8cbb9a256033470d3647 Mon Sep 17 00:00:00 2001 | 1 | From 12d06b2c5857a1c9cac4c964f32a582d029e9dfa 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 09/10] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 09/10] Add -external-hostbindir option for native(sdk) |
@@ -130,5 +130,5 @@ index 3bf0546..53bf146 100644 | |||
130 | addConfStr(1, hostSpec); | 130 | addConfStr(1, hostSpec); |
131 | 131 | ||
132 | -- | 132 | -- |
133 | 2.5.3 | 133 | 2.6.1 |
134 | 134 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 760f446c..26503373 100644 --- a/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b0648c997d24855b2a6f56fc61e3159af815fb4d Mon Sep 17 00:00:00 2001 | 1 | From 8ed228de093947c176cd1d8984a61e3b338bbe66 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 09/10] linux-oe-g++: Invert conditional for defining | 4 | Subject: [PATCH 09/10] linux-oe-g++: Invert conditional for defining |
@@ -32,5 +32,5 @@ index dd12003..8623651 100644 | |||
32 | 32 | ||
33 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | 33 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
34 | -- | 34 | -- |
35 | 2.5.3 | 35 | 2.6.1 |
36 | 36 | ||