qtbase: refresh patches and add missing to 5.0.2 and git versions

10 files changed, 19 insertions, 15 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 2d9d539b..49244bef 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,7 +1,7 @@
 From f5d5c9778031fbb807753c67133ddda35f9a0e30 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 1/6] Add linux-oe-g++ platform
+Subject: [PATCH 01/11] Add linux-oe-g++ platform
 
 * This qmake.conf unlike other platforms reads most variables from
   shell environment, because it's easier for qt recipes to export
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 f2a6efca..fc71a653 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,8 +1,8 @@
 From 29812cee9589dedd10a94b66ed5279549ed62f36 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 2/6] qlibraryinfo: allow to set qt.conf from the outside using
- the environment
+Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
 
 Allow to set a qt.conf from the outside using the environment. This allows
 to inject new prefixes and other paths into qmake. This is needed when using
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 338b1c32..14d5d52f 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
 From 72d8aaf00e3d722b56b66bd5fa1f1f3d3e8a8552 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 3/6] Add -external-hostbindir option
+Subject: [PATCH 03/11] Add -external-hostbindir option
 
 * when cross-compiling it's sometimes useful to use existing tools from machine
   (or in OpenEmbedded built with separate native recipe) when building for target
@@ -118,7 +118,7 @@ index bbd4734..dca0c58 100644
      { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
      { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
      { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
-+    { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, false },
++    { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
      { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
      { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
  };
diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch
index 91709741..f934cf1d 100644
--- a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
 From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 4/6] qmake is already built in qtbase-native
+Subject: [PATCH 04/11] qmake is already built in qtbase-native
 
 Ported from OE by: Yu Ke <ke.yu@intel.com>
 Upstream-Status: Inappropriate [configuration]
diff --git a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch
index 4d163443..af8eb463 100644
--- a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
 From d33f33aed6744b5c4c561e6c6527d784481604f5 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.intel.com>
 Date: Mon, 29 Oct 2012 20:26:36 -0700
-Subject: [PATCH 5/6] Allow building a separate qmake for the target
+Subject: [PATCH 05/11] Allow building a separate qmake for the target
 
 Upstream-Status: Inappropriate [config]
 
diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
index d1cacd3e..ed238bcc 100644
--- a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,7 +1,7 @@
 From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 17 Apr 2013 18:06:25 +0200
-Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check
+Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check
 
 * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
 
diff --git a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index b9f8cb73..3229e14b 100644
--- a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,9 +1,10 @@
-From 1548dbf04ab1dbc45e514478fb82b4a0827140b1 Mon Sep 17 00:00:00 2001
+From 4ba11842fa29ba28a05b3e8e511432fe360b4957 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 8/8] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
+Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017
 ---
  tools/configure/configureapp.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch
index e833cc5c..0574ca89 100644
--- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,7 +1,7 @@
-From 1120258fc6a60972523186e85c2c762b79e7a6c2 Mon Sep 17 00:00:00 2001
+From 4ba266bc0a7e4841cfd06d555b39888928a6e3a5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 9/9] qt_module: Fix pkgconfig replacement
+Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement
 
 * in situation like this:
   QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
diff --git a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
index fcecc720..7594058f 100644
--- a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
+++ b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
@@ -1,12 +1,15 @@
-From b00e2fa5ade9bed1b75f4629cc7ba2c3ec9e429f Mon Sep 17 00:00:00 2001
+From 5b01ec1b8da7fc949efea262647a9d6010c670f4 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 22:51:54 +0200
-Subject: [PATCH 10/10] qmake/property: rename QT_INSTALL_CONFIGURATION to
+Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to
  QT_INSTALL_SETTINGS
 
 * this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS
   property.cpp was only place using name QT_INSTALL_CONFIGURATION
 
+Upstream-Status: Submitted
+https://codereview.qt-project.org/54912
+
 Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da
 ---
  qmake/property.cpp | 2 +-
diff --git a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch
index 878ced6b..6eab1cb5 100644
--- a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch
+++ b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch
@@ -1,4 +1,4 @@
-From 4af56553508993944e8ba6688c182d0e49eee1a1 Mon Sep 17 00:00:00 2001
+From 1809b8b32d3b8a689eb5d40f096b3541345ff219 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sun, 28 Apr 2013 12:56:55 +0200
 Subject: [PATCH 11/11] qt_module: Fix paths in .prl files