diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:14:57 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 00:07:14 +0200 |
| commit | 04240161ef8ec0f584c68485abc02778786c5e75 (patch) | |
| tree | d02eae04e6774cbad54a3fc13e55a373a57bc549 /recipes-qt/qt5/qtbase-git | |
| parent | 932b32c1c9e9a3ac833c82ff9273683345056ec7 (diff) | |
| download | meta-qt5-04240161ef8ec0f584c68485abc02778786c5e75.tar.gz | |
git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance
* I plan to apply this to fido branch (as well as final upgrade to 5.4.2
recipes
* I'm preparing similar patch for 5.5 revisions, which will be applied
only in master branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git')
15 files changed, 33 insertions, 33 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index a1ce9f2f..f34aed42 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e04fdddaeb59006c2d599b8b261ce714341029ba Mon Sep 17 00:00:00 2001 | 1 | From 08f6be97c3f088fd8a2d752441c638093eedd990 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/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform |
| @@ -347,5 +347,5 @@ index 0000000..dd12003 | |||
| 347 | + | 347 | + |
| 348 | +#endif // QPLATFORMDEFS_H | 348 | +#endif // QPLATFORMDEFS_H |
| 349 | -- | 349 | -- |
| 350 | 2.3.1 | 350 | 2.3.5 |
| 351 | 351 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 306af7f5..ec2bcb49 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 182e7a96a99e9bcabcbd8858c377035a47e4e3e8 Mon Sep 17 00:00:00 2001 | 1 | From 31fa051d53e26301ef6abf72bd3f992d7c16cad2 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/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside |
| @@ -35,5 +35,5 @@ index d66007b..91ca643 100644 | |||
| 35 | if(!QFile::exists(qtconfig)) | 35 | if(!QFile::exists(qtconfig)) |
| 36 | qtconfig = qt_libraryInfoFile(); | 36 | qtconfig = qt_libraryInfoFile(); |
| 37 | -- | 37 | -- |
| 38 | 2.3.1 | 38 | 2.3.5 |
| 39 | 39 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 4451751d..779ea918 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 457efc32bb79060a0a58a82ff8a35d67655ef6d6 Mon Sep 17 00:00:00 2001 | 1 | From cf4e996876e0b467b7aae124c7cb285f677bf6b0 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/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/12] Add -external-hostbindir option |
| @@ -95,10 +95,10 @@ index 0a00d6d..ad5f4cd 100755 | |||
| 95 | "qt_hostspec=$shortspec", | 95 | "qt_hostspec=$shortspec", |
| 96 | #endif | 96 | #endif |
| 97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
| 98 | index 7961f65..e11b23d 100644 | 98 | index 79b4eab..8c6913e 100644 |
| 99 | --- a/mkspecs/features/qt_functions.prf | 99 | --- a/mkspecs/features/qt_functions.prf |
| 100 | +++ b/mkspecs/features/qt_functions.prf | 100 | +++ b/mkspecs/features/qt_functions.prf |
| 101 | @@ -192,7 +192,11 @@ defineTest(qtAddRpathLink) { | 101 | @@ -198,7 +198,11 @@ defineTest(qtAddRpathLink) { |
| 102 | defineTest(qtPrepareTool) { | 102 | defineTest(qtPrepareTool) { |
| 103 | cmd = $$eval(QT_TOOL.$${2}.binary) | 103 | cmd = $$eval(QT_TOOL.$${2}.binary) |
| 104 | isEmpty(cmd) { | 104 | isEmpty(cmd) { |
| @@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 | |||
| 229 | _qt5_Widgets_check_file_exists(${imported_location}) | 229 | _qt5_Widgets_check_file_exists(${imported_location}) |
| 230 | 230 | ||
| 231 | -- | 231 | -- |
| 232 | 2.3.1 | 232 | 2.3.5 |
| 233 | 233 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 20ddff94..c586775f 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 8c5554c1ee9a18548c166f6c3a7b487b9d3cdc3e Mon Sep 17 00:00:00 2001 | 1 | From bf9f8df42f5a7ac4a0cb4bdad8c849228aa79b35 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/12] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements |
| @@ -80,7 +80,7 @@ index eb65e73..4db40d0 100644 | |||
| 80 | lib_replace.CONFIG = path | 80 | lib_replace.CONFIG = path |
| 81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace | 81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace |
| 82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
| 83 | index d213f9e..915c596 100644 | 83 | index 2437efe..2e1f014 100644 |
| 84 | --- a/mkspecs/features/qt_module.prf | 84 | --- a/mkspecs/features/qt_module.prf |
| 85 | +++ b/mkspecs/features/qt_module.prf | 85 | +++ b/mkspecs/features/qt_module.prf |
| 86 | @@ -192,10 +192,25 @@ unix|mingw { | 86 | @@ -192,10 +192,25 @@ unix|mingw { |
| @@ -110,5 +110,5 @@ index d213f9e..915c596 100644 | |||
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | -- | 112 | -- |
| 113 | 2.3.1 | 113 | 2.3.5 |
| 114 | 114 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 02dc13a6..9723beac 100644 --- a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 825043f0a657cd4b8c3af0e00c79684388460d5c Mon Sep 17 00:00:00 2001 | 1 | From f8a4e063b45b5b941738dd90ea7c74063bc1e49f 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, 21 Apr 2014 19:22:04 +0200 | 3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 |
| 4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" |
| @@ -93,5 +93,5 @@ index 7cc3300..ccbd974a 100644 | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | -- | 95 | -- |
| 96 | 2.3.1 | 96 | 2.3.5 |
| 97 | 97 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 251cdc6e..04fb3709 100644 --- a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From b4d4c91bb504c9e90b69a2d78453bf3523ec6822 Mon Sep 17 00:00:00 2001 | 1 | From 6061c8457ea1f76745bd9918e61bda01ef96ce56 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 06/12] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h |
| @@ -26,5 +26,5 @@ index 2b5d5f5..a0aab03 100644 | |||
| 26 | 26 | ||
| 27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformScreen; |
| 28 | -- | 28 | -- |
| 29 | 2.3.1 | 29 | 2.3.5 |
| 30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch index 23bfa77f..be75d72c 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e4235e3a0ebe4494ad1f4f550ddb070100e530e1 Mon Sep 17 00:00:00 2001 | 1 | From a6b01490248be28c1db3abd5f710c5d7d9afee55 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 07/12] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters |
| @@ -25,5 +25,5 @@ index ad5f4cd..c19ff6a 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 | 2.3.1 | 28 | 2.3.5 |
| 29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index e7e50844..e4d4327c 100644 --- a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 715b5d739b36588cd2e34962b33a59da1f5427fe Mon Sep 17 00:00:00 2001 | 1 | From d1712999887b9809cce57b1e6c008c454330cd2e Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 | 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 |
| 4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one |
| @@ -68,5 +68,5 @@ index 39a3ef9..2c05979 100644 | |||
| 68 | 68 | ||
| 69 | if (isRaster()) { | 69 | if (isRaster()) { |
| 70 | -- | 70 | -- |
| 71 | 2.3.1 | 71 | 2.3.5 |
| 72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch index 2f5835c0..bebb3d95 100644 --- a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From ab8aa4e79e156ac6df8cd36e287faf838bc32344 Mon Sep 17 00:00:00 2001 | 1 | From a34538ff13c520fa85df689255469a316f037d0d 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 09/12] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support |
| @@ -153,5 +153,5 @@ index cd268cd..997bc35 100644 | |||
| 153 | } else { | 153 | } else { |
| 154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
| 155 | -- | 155 | -- |
| 156 | 2.3.1 | 156 | 2.3.5 |
| 157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch index 1f92eed8..f2eed114 100644 --- a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 276b5046788007bcbc5607046becdd44151960c0 Mon Sep 17 00:00:00 2001 | 1 | From 16a55457ce31d467cb331ab8e94b672757ef42b9 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: Thu, 18 Dec 2014 13:41:09 +0100 | 3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 |
| 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir |
| @@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 | |||
| 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) |
| 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") |
| 40 | -- | 40 | -- |
| 41 | 2.3.1 | 41 | 2.3.5 |
| 42 | 42 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch index 3ff193a5..da17878e 100644 --- a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From c87f9a5ec9a08c415ede4d5118deeb4177778338 Mon Sep 17 00:00:00 2001 | 1 | From 5a6ad20dd4fde6a0581be895d763aae43f1fc2b6 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 11/13] Always build uic | 4 | Subject: [PATCH 11/13] Always build uic |
| @@ -27,5 +27,5 @@ index 83f7587..9dbcf70 100644 | |||
| 27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
| 28 | 28 | ||
| 29 | -- | 29 | -- |
| 30 | 2.3.1 | 30 | 2.3.5 |
| 31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 83457f02..96198b1f 100644 --- a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f298d49fd1b88ae9bf8f35339a52cd333f42434b Mon Sep 17 00:00:00 2001 | 1 | From 6c0cc990522454e0c9e52ba969c3a8c5937157b8 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 11/12] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 11/12] 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.3.1 | 67 | 2.3.5 |
| 68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch index 82505a7a..4c044c0d 100644 --- a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e598364920b2ff4a90aaaaeb0c58162d1cb64221 Mon Sep 17 00:00:00 2001 | 1 | From 6425d71d52c5587f323fe28af62530d5c82b02fd 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 12/13] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) |
| @@ -104,5 +104,5 @@ index 6e9d4aa..0ca4daf 100644 | |||
| 104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
| 105 | << "#endif" << endl | 105 | << "#endif" << endl |
| 106 | -- | 106 | -- |
| 107 | 2.3.1 | 107 | 2.3.5 |
| 108 | 108 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch index 204819c8..0a7eb15e 100644 --- a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch +++ b/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From dbfa83051ddb8db0b4a59b226d4e4a41101ae26e Mon Sep 17 00:00:00 2001 | 1 | From 84c23fc01b28087de35604ef971227b57fb77876 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: Thu, 22 Jan 2015 16:09:35 +0100 | 3 | Date: Thu, 22 Jan 2015 16:09:35 +0100 |
| 4 | Subject: [PATCH 12/12] Set paths for target properly | 4 | Subject: [PATCH 12/12] Set paths for target properly |
| @@ -68,5 +68,5 @@ index 7a34b11..7bb4476 100755 | |||
| 68 | }; | 68 | }; |
| 69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; | 69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; |
| 70 | -- | 70 | -- |
| 71 | 2.3.1 | 71 | 2.3.5 |
| 72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch index 4b48b5b6..0b271a35 100644 --- a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 4ccd1823b88c039415b68a1dc2040859178cb56f Mon Sep 17 00:00:00 2001 | 1 | From 6b980c8132800001b2f0c5c0e76f7cc7c60d14ee 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 13/13] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native |
| @@ -26,5 +26,5 @@ index c19ff6a..2d920e3 100755 | |||
| 26 | echo "Running configuration tests..." | 26 | echo "Running configuration tests..." |
| 27 | 27 | ||
| 28 | -- | 28 | -- |
| 29 | 2.3.1 | 29 | 2.3.5 |
| 30 | 30 | ||
