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>

13 files changed, 47 insertions, 70 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 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-git/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 b239fd5b..4d04c7ce 100644
--- a/recipes-qt/qt5/qtbase-git/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 a6a15ff0150ca685909782f0ca861fa4336f33b3 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) {