qtbase: refresh patches, drop 2 unused

* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
  rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
  used in recipes

* 0004-Disable-mkv8snapshot.patch and
  0005-AddSynchoronization-qimagereader.patch are special, because they
  are applied only to 5.0.0

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

41 files changed, 162 insertions, 230 deletions

diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch
index 1cd7dd60..eaa64515 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
-From 231e94888c257da84bd39b138f5010c255387ae3 Mon Sep 17 00:00:00 2001
+From d64321c240cbb949b9e55e2cd448c78bf9865c56 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 01/12] Add linux-oe-g++ platform
@@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform
 
 Upstream-Status: Pending
 
-Change-Id: I464fe8f17fa4ed4c80165183daf79b08fc491697
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                            |  54 ++++++++++++++++---
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index be7813ae..38aeb221 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
-From 5ba803e0ad0883ff6abc0e1efa1bf3ac3765348d Mon Sep 17 00:00:00 2001
+From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/12] 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
@@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded
 
 Upstream-Status: Pending
 
-Change-Id: Ice5b16b3e3f6ba2c6cff7bd055d074628ab3aed0
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  src/corelib/global/qlibraryinfo.cpp | 5 ++++-
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
index e44d7381..cd63c449 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch
@@ -1,13 +1,15 @@
-From 79f1b015148779b92dc6e65dffd297b8b9522f79 Mon Sep 17 00:00:00 2001
+From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 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 03/11] Add -external-hostbindir option
+Subject: [PATCH 03/12] 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
 
 * this way we can skip bootstraping tools we already have
 
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                           | 15 ++++++++++++++-
@@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644
  
  # If we are doing a prefix build, create a "module" pri which enables
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index acd11f5..bba0861 100644
+index 6b40731..139a60f 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild()
+@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
   */
  
  static const struct {
@@ -168,7 +170,7 @@ index acd11f5..bba0861 100644
  } qtConfEntries[] = {
      { "Prefix", "." },
      { "Documentation", "doc" }, // should be ${Data}/doc
-@@ -297,6 +297,7 @@ static const struct {
+@@ -295,6 +295,7 @@ static const struct {
      { "HostPrefix", "" },
      { "HostBinaries", "bin" },
      { "HostData", "." },
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch
index ff5bc0c1..7941ef97 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,9 +1,13 @@
-From 753924949e1d72c63283ecc904e2134fa76888d7 Mon Sep 17 00:00:00 2001
+From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 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 06/11] qt_functions: temporary remove isEmpty check
+Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check
 
 * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
+* isEmpty works correctly only with qmake variables (e.g. $$FOO -
+  isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
+
+Upstream-Status: Pending
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch
index 93cd334d..d2418fc6 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
-From 1dd6ee9bb2aafb8d77d9c7e465b9cf6d778bc283 Mon Sep 17 00:00:00 2001
+From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 04/11] qmake is already built in qtbase-native
+Subject: [PATCH 05/12] 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-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch
index af8eb463..fe03edcd 100644
--- a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
-From d33f33aed6744b5c4c561e6c6527d784481604f5 Mon Sep 17 00:00:00 2001
+From 76537aca4118f5f7c336b7d17594c9644b6272b5 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 05/11] Allow building a separate qmake for the target
+Subject: [PATCH 06/12] Allow building a separate qmake for the target
 
 Upstream-Status: Inappropriate [config]
 
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index c7c418fd..3cfe8c3b 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,10 +1,11 @@
-From c6909ce9ed3e65833ae835d89b346fbb158a1127 Mon Sep 17 00:00:00 2001
+From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 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 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
-Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  tools/configure/configureapp.cpp | 4 ++--
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch
index a9f66b7c..d7c8d35a 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,7 +1,7 @@
-From 0bd37923dec93270066fc4362db7e443475a4b06 Mon Sep 17 00:00:00 2001
+From 8a97079c1b17f27256a4a816e5cc85344c29ac6f 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 09/11] qt_module: Fix pkgconfig replacement
+Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement
 
 * in situation like this:
   QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
@@ -19,7 +19,8 @@ Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement
   cross-compile unfriendly, keeping ${libdir}/${includedir} works better
   in my case
 
-Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/qt_module.prf | 16 ++++++++++++++--
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch
index 19523084..13112c44 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch
@@ -1,7 +1,7 @@
-From 851960243212ffe0ac25d0fea236b7a8bc0e5dc5 Mon Sep 17 00:00:00 2001
+From a70d48880e27586efe5f6aa195385207abf3cead 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
+Subject: [PATCH 09/12] qt_module: Fix paths in .prl files
 
 * qmake does not prefix them with QT_SYSROOT when using them
   so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
@@ -11,7 +11,8 @@ Subject: [PATCH 11/11] qt_module: Fix paths in .prl files
   SSTATE_SCAN_FILES += "*.pri *.prl"
   to make them relocateble
 
-Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
deleted file mode 100644
index d5a31acf..00000000
--- a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 10dde2fe0b7d8fe9ca7b4aa21d351b5dc01341c0 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/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: I0f3c3b5c0527d22c0171674710cdbb32f10e990f
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- qmake/property.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qmake/property.cpp b/qmake/property.cpp
-index c1b7a9f..af2eacf 100644
---- a/qmake/property.cpp
-+++ b/qmake/property.cpp
-@@ -68,7 +68,7 @@ static const struct {
-     { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false },
-     { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false },
-     { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false },
--    { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false },
-+    { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false },
-     { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false },
-     { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat
-     { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
--- 
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch
index 1d2d35e5..cac2bfed 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch
@@ -1,11 +1,12 @@
-From a74a1b5bc86553863b8dcbea7a7fde5642e73115 Mon Sep 17 00:00:00 2001
+From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sun, 5 May 2013 11:18:34 +0200
-Subject: [PATCH 12/12] wayland-scanner: disable silent rules
+Subject: [PATCH 10/12] wayland-scanner: disable silent rules
 
 * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
 
-Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/wayland-scanner.prf | 6 +++---
diff --git a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index d4a11d1e..9436e398 100644
--- a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,19 +1,20 @@
-From ec6de65fc787c8a5e782b48b6794646f274da43a Mon Sep 17 00:00:00 2001
+From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 8 May 2013 23:54:35 +0200
-Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars
+Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars
 
 * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
   causing issues as we need g++ to be used as linker
 
-Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure | 15 +--------------
  1 file changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/configure b/configure
-index feb1435..6d3d1e2 100755
+index 546bed2..34074ee 100755
 --- a/configure
 +++ b/configure
 @@ -740,20 +740,7 @@ fi'`
diff --git a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
index 79d314c5..fe891df0 100644
--- a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -1,18 +1,20 @@
-From 01653e270c4a9169a32c0002a87a6644727d0b11 Mon Sep 17 00:00:00 2001
+From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Thu, 9 May 2013 10:06:50 +0200
-Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make
+Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make
 
 * sometimes we would like to add -e or define some variable and respect it from both
-  Makefiles used in configure tests and also Maakefiles to build the application
+  Makefiles used in configure tests and also Makefiles to build the application
 
-Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/configure.prf | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 39144e7..1864ba8 100644
+index 39144e7..de48b07 100644
 --- a/mkspecs/features/configure.prf
 +++ b/mkspecs/features/configure.prf
 @@ -54,12 +54,12 @@ defineTest(qtCompileTest) {
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 1f328977..f55d474a 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 @@
-From 853b6920e9f10a29c5619b4239e960ad33080e8e Mon Sep 17 00:00:00 2001
+From e45d617fd823f683ed426d09fd8b6edefb9517ab 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 01/12] Add linux-oe-g++ platform
@@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform
 
 Upstream-Status: Pending
 
-Change-Id: Ie1eb097efe289179b86d5d11740274114e50639d
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                            |  54 ++++++++++++++++---
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 dfb6ae93..0725347a 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,7 +1,7 @@
-From e4636d4d18246278fb504cff3e16321c98d1f99d Mon Sep 17 00:00:00 2001
+From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/12] 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
@@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded
 
 Upstream-Status: Pending
 
-Change-Id: I0a53b713574e1860189fa52b44251eb4d19eeddc
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  src/corelib/global/qlibraryinfo.cpp | 5 ++++-
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 e1c56ac3..2a64291a 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,13 +1,15 @@
-From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001
+From c9bf00e21ae398575adf4411e67b35cdf44920e5 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 03/11] Add -external-hostbindir option
+Subject: [PATCH 03/12] 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
 
 * this way we can skip bootstraping tools we already have
 
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                           | 15 ++++++++++++++-
@@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644
  
  # If we are doing a prefix build, create a "module" pri which enables
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index acd11f5..bba0861 100644
+index 6b40731..139a60f 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild()
+@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
   */
  
  static const struct {
@@ -168,7 +170,7 @@ index acd11f5..bba0861 100644
  } qtConfEntries[] = {
      { "Prefix", "." },
      { "Documentation", "doc" }, // should be ${Data}/doc
-@@ -297,6 +297,7 @@ static const struct {
+@@ -295,6 +295,7 @@ static const struct {
      { "HostPrefix", "" },
      { "HostBinaries", "bin" },
      { "HostData", "." },
diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
index a2b1e5e8..6e694544 100644
--- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,9 +1,13 @@
-From e356895802c2a1e596882c79161994ebbf361d65 Mon Sep 17 00:00:00 2001
+From e561978ab73e72d7b088c9927fb6a87d2eff6833 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 06/11] qt_functions: temporary remove isEmpty check
+Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check
 
 * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
+* isEmpty works correctly only with qmake variables (e.g. $$FOO -
+  isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
+
+Upstream-Status: Pending
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
diff --git a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
index 285c8a46..febefb8a 100644
--- a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
-From d0f322cf4ee9ead48997bb3e3a2c137bba91141b Mon Sep 17 00:00:00 2001
+From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 04/11] qmake is already built in qtbase-native
+Subject: [PATCH 05/12] 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-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
index 3889ab13..4d04c7ce 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
-From 41ee07272cea21621c26ddeb02a3756e94b29f9a Mon Sep 17 00:00:00 2001
+From 8be64919365240728dcce02fac44e5018aaec191 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 05/11] Allow building a separate qmake for the target
+Subject: [PATCH 06/12] Allow building a separate qmake for the target
 
 Upstream-Status: Inappropriate [config]
 
diff --git a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index 90d6f75a..a1129f79 100644
--- a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,10 +1,10 @@
-From 6c494ea0e73c9ef60f45e7fdc0de40bb51ad5ac6 Mon Sep 17 00:00:00 2001
+From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e 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 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
-Change-Id: I464c25888ab8b99ced6bd669b5c6448d491725a8
+Upstream-Status: Pending
 ---
  tools/configure/configureapp.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
index 67769b33..1b3c185f 100644
--- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,7 +1,7 @@
-From 72f1087fef0e506b9ab015498f5c7a4b3161c6f3 Mon Sep 17 00:00:00 2001
+From 1ac376893b75c36cc1ee6465e814546e2215354e 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 09/11] qt_module: Fix pkgconfig replacement
+Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement
 
 * in situation like this:
   QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
@@ -19,7 +19,8 @@ Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement
   cross-compile unfriendly, keeping ${libdir}/${includedir} works better
   in my case
 
-Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/qt_module.prf | 16 ++++++++++++++--
diff --git a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
index 65fd4f5e..1d68efc9 100644
--- a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch
+++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
@@ -1,7 +1,7 @@
-From 57da761a8e1995a20250c6600bc99937a7b203b4 Mon Sep 17 00:00:00 2001
+From 111583f7a46871d130ac1c6688972ebf98452af4 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
+Subject: [PATCH 09/12] qt_module: Fix paths in .prl files
 
 * qmake does not prefix them with QT_SYSROOT when using them
   so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
@@ -11,7 +11,8 @@ Subject: [PATCH 11/11] qt_module: Fix paths in .prl files
   SSTATE_SCAN_FILES += "*.pri *.prl"
   to make them relocateble
 
-Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
diff --git a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
deleted file mode 100644
index 4fa772cd..00000000
--- a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6d816874a95cb85bdf96e06f763e21c098d92b89 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/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 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qmake/property.cpp b/qmake/property.cpp
-index c1b7a9f..af2eacf 100644
---- a/qmake/property.cpp
-+++ b/qmake/property.cpp
-@@ -68,7 +68,7 @@ static const struct {
-     { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false },
-     { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false },
-     { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false },
--    { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false },
-+    { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false },
-     { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false },
-     { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat
-     { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
--- 
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
index ca55e625..cac9bef4 100644
--- a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch
+++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
@@ -1,11 +1,12 @@
-From db28b82f5a0deb14f57dcfe5c2743ec6b844b9aa Mon Sep 17 00:00:00 2001
+From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sun, 5 May 2013 11:18:34 +0200
-Subject: [PATCH 12/12] wayland-scanner: disable silent rules
+Subject: [PATCH 10/12] wayland-scanner: disable silent rules
 
 * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
 
-Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/wayland-scanner.prf | 14 +++++++-------
diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index 606b0a6d..fda64981 100644
--- a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,19 +1,20 @@
-From afb5a8d45bd7c816eed959c08b05bbcd86814503 Mon Sep 17 00:00:00 2001
+From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 8 May 2013 23:54:35 +0200
-Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars
+Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars
 
 * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
   causing issues as we need g++ to be used as linker
 
-Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure | 15 +--------------
  1 file changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/configure b/configure
-index 866e535..620ffd6 100755
+index dbf99a9..9ca23a4 100755
 --- a/configure
 +++ b/configure
 @@ -840,20 +840,7 @@ fi'`
diff --git a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
index 7d4b32bf..7bcfd7f7 100644
--- a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -1,18 +1,20 @@
-From c57cec0fdcbc89671ef297c68554e27fbe99c09d Mon Sep 17 00:00:00 2001
+From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Thu, 9 May 2013 10:06:50 +0200
-Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make
+Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make
 
 * sometimes we would like to add -e or define some variable and respect it from both
-  Makefiles used in configure tests and also Maakefiles to build the application
+  Makefiles used in configure tests and also Makefiles to build the application
 
-Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/configure.prf | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index b4569df..50ca562 100644
+index b4569df..d189e50 100644
 --- a/mkspecs/features/configure.prf
 +++ b/mkspecs/features/configure.prf
 @@ -57,12 +57,12 @@ defineTest(qtCompileTest) {
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 87698227..c7428587 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -9,19 +9,21 @@ QT_MODULE = "qtbase"
 
 require qt5-native.inc
 
-# shared with target qtbase
+# shared with target qtbase, all except 
+# 0005-qmake-is-already-built-in-qtbase-native.patch
+# 0006-Allow-building-a-separate-qmake-for-the-target.patch
+
 SRC_URI += " \
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0003-Add-external-hostbindir-option.patch \
-    file://0006-qt_functions-temporary-remove-isEmpty-check.patch \
-    file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
-    file://0009-qt_module-Fix-pkgconfig-replacement.patch \
-    file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
-    file://0011-qt_module-Fix-paths-in-.prl-files.patch \
-    file://0012-wayland-scanner-disable-silent-rules.patch \
-    file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
-    file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
+    file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
+    file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+    file://0008-qt_module-Fix-pkgconfig-replacement.patch \
+    file://0009-qt_module-Fix-paths-in-.prl-files.patch \
+    file://0010-wayland-scanner-disable-silent-rules.patch \
+    file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
+    file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
 "
 
 # specific for native version
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 21a52733..5d4334ac 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -4,16 +4,15 @@ SRC_URI += " \
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0003-Add-external-hostbindir-option.patch \
-    file://0004-qmake-is-already-built-in-qtbase-native.patch \
-    file://0005-Allow-building-a-separate-qmake-for-the-target.patch \
-    file://0006-qt_functions-temporary-remove-isEmpty-check.patch \
-    file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
-    file://0009-qt_module-Fix-pkgconfig-replacement.patch \
-    file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
-    file://0011-qt_module-Fix-paths-in-.prl-files.patch \
-    file://0012-wayland-scanner-disable-silent-rules.patch \
-    file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
-    file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
+    file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
+    file://0005-qmake-is-already-built-in-qtbase-native.patch \
+    file://0006-Allow-building-a-separate-qmake-for-the-target.patch \
+    file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+    file://0008-qt_module-Fix-pkgconfig-replacement.patch \
+    file://0009-qt_module-Fix-paths-in-.prl-files.patch \
+    file://0010-wayland-scanner-disable-silent-rules.patch \
+    file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
+    file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
 "
 
 DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}"
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 5907490c..f4645f69 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 @@
-From ccf2e79173cfd0fee9f1e603107792dd5aa8e775 Mon Sep 17 00:00:00 2001
+From 4edde46f33aacc24fffa021adcc7e0d68ba414a3 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 01/12] Add linux-oe-g++ platform
@@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform
 
 Upstream-Status: Pending
 
-Change-Id: Ia0cc6a6b00ec78442d80ed2a3cf40b604588a0f6
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                            |  54 ++++++++++++++++---
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 883b8096..fc8a481e 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,7 +1,7 @@
-From 7d3de13a6d7a3142da0a5c6ebd815d343a356a23 Mon Sep 17 00:00:00 2001
+From a836731e94223d49ef05fdabe7905dd1b25c647c Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/12] 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
@@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded
 
 Upstream-Status: Pending
 
-Change-Id: I9247949c20a39eac8e815c175510ea3fb5bf9d33
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  src/corelib/global/qlibraryinfo.cpp | 5 ++++-
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 14d5d52f..8c100bc5 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,13 +1,15 @@
-From 72d8aaf00e3d722b56b66bd5fa1f1f3d3e8a8552 Mon Sep 17 00:00:00 2001
+From 3b0a595bbe9d5bce898fc5a84c9bb39c976b9f7d 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 03/11] Add -external-hostbindir option
+Subject: [PATCH 03/12] 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
 
 * this way we can skip bootstraping tools we already have
 
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                           | 15 ++++++++++++++-
@@ -156,10 +158,10 @@ index e66d9fb..a6ae763 100644
  
  #mkspecs
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index c16dfcb..56a269f 100644
+index 8138fff..301643f 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild()
+@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
   */
  
  static const struct {
@@ -168,7 +170,7 @@ index c16dfcb..56a269f 100644
  } qtConfEntries[] = {
      { "Prefix", "." },
      { "Documentation", "doc" }, // should be ${Data}/doc
-@@ -293,6 +293,7 @@ static const struct {
+@@ -291,6 +291,7 @@ static const struct {
      { "HostPrefix", "" },
      { "HostBinaries", "bin" },
      { "HostData", "." },
diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch
index ed238bcc..d39130c1 100644
--- a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,9 +1,13 @@
-From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001
+From ff72f8350e8b2ded813163150a7d1874061ed589 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 06/11] qt_functions: temporary remove isEmpty check
+Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check
 
 * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
+* isEmpty works correctly only with qmake variables (e.g. $$FOO -
+  isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
+
+Upstream-Status: Pending
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch
index f934cf1d..319aae6f 100644
--- a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
-From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001
+From 240fb45541c06103e8a930beeb5ee59a15b529bf Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 04/11] qmake is already built in qtbase-native
+Subject: [PATCH 05/12] 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-git/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch
index b239fd5b..c639c172 100644
--- a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
-From a6a15ff0150ca685909782f0ca861fa4336f33b3 Mon Sep 17 00:00:00 2001
+From 892351a55c3f6a033a1823e104315cb0f03b454d 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 05/11] Allow building a separate qmake for the target
+Subject: [PATCH 06/12] Allow building a separate qmake for the target
 
 Upstream-Status: Inappropriate [config]
 
diff --git a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index 3229e14b..c40c66b1 100644
--- a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,10 +1,10 @@
-From 4ba11842fa29ba28a05b3e8e511432fe360b4957 Mon Sep 17 00:00:00 2001
+From 9928daa856cd7433618df38b263e029fb9948679 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 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with
  SYSROOT
 
-Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017
+Upstream-Status: Pending
 ---
  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/0008-qt_module-Fix-pkgconfig-replacement.patch
index 0574ca89..8d40e4f2 100644
--- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,7 +1,7 @@
-From 4ba266bc0a7e4841cfd06d555b39888928a6e3a5 Mon Sep 17 00:00:00 2001
+From 063936d0daabacad8c9b8e68adf9423d54846290 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 09/11] qt_module: Fix pkgconfig replacement
+Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement
 
 * in situation like this:
   QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
@@ -19,7 +19,8 @@ Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement
   cross-compile unfriendly, keeping ${libdir}/${includedir} works better
   in my case
 
-Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/qt_module.prf | 16 ++++++++++++++--
diff --git a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch
index 6eab1cb5..dde3b95b 100644
--- a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch
+++ b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch
@@ -1,7 +1,7 @@
-From 1809b8b32d3b8a689eb5d40f096b3541345ff219 Mon Sep 17 00:00:00 2001
+From 1a0133993cc7924208dd4a0d818599accbcf999e 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
+Subject: [PATCH 09/12] qt_module: Fix paths in .prl files
 
 * qmake does not prefix them with QT_SYSROOT when using them
   so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
@@ -11,7 +11,8 @@ Subject: [PATCH 11/11] qt_module: Fix paths in .prl files
   SSTATE_SCAN_FILES += "*.pri *.prl"
   to make them relocateble
 
-Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
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
deleted file mode 100644
index 7594058f..00000000
--- a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/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 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qmake/property.cpp b/qmake/property.cpp
-index dca0c58..8ebba3b 100644
---- a/qmake/property.cpp
-+++ b/qmake/property.cpp
-@@ -68,7 +68,7 @@ static const struct {
-     { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false },
-     { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false },
-     { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false },
--    { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false },
-+    { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false },
-     { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false },
-     { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat
-     { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
--- 
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch
index 9431e79e..ff8aaa1d 100644
--- a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch
+++ b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch
@@ -1,11 +1,12 @@
-From 41a352655485234eda87b150154001ce89496505 Mon Sep 17 00:00:00 2001
+From 668c20fe721aba2057c8e929e5029c423a687360 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sun, 5 May 2013 11:18:34 +0200
-Subject: [PATCH 12/12] wayland-scanner: disable silent rules
+Subject: [PATCH 10/12] wayland-scanner: disable silent rules
 
 * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
 
-Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/wayland-scanner.prf | 6 +++---
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index 9dce1a02..d1402124 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,19 +1,20 @@
-From a81111b76b2890b51d645ee25267a4e6a2eaed1f Mon Sep 17 00:00:00 2001
+From 62c2c404238e007021a80fcf62b51173be23a67e Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 8 May 2013 23:54:35 +0200
-Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars
+Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars
 
 * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
   causing issues as we need g++ to be used as linker
 
-Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
+Upstream-Status: Pending
+
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure | 15 +--------------
  1 file changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/configure b/configure
-index d4131dc..fcd8ecc 100755
+index 8710c28..8b97cc2 100755
 --- a/configure
 +++ b/configure
 @@ -740,20 +740,7 @@ fi'`
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
index e432b979..5d7cbc34 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -1,18 +1,20 @@
-From 68c459603bcf545637e852e08613c6fca4da9ef9 Mon Sep 17 00:00:00 2001
+From b0a008c649f76e0353f49f9c953e9d8141e5927a Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Thu, 9 May 2013 10:06:50 +0200
-Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make
+Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make
 
 * sometimes we would like to add -e or define some variable and respect it from both
-  Makefiles used in configure tests and also Maakefiles to build the application
+  Makefiles used in configure tests and also Makefiles to build the application
 
-Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  mkspecs/features/configure.prf | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 39144e7..1864ba8 100644
+index 39144e7..de48b07 100644
 --- a/mkspecs/features/configure.prf
 +++ b/mkspecs/features/configure.prf
 @@ -54,12 +54,12 @@ defineTest(qtCompileTest) {