13 files changed, 47 insertions, 70 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 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/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 af8eb463..c639c172 100644
--- a/recipes-qt/qt5/qtbase/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 d33f33aed6744b5c4c561e6c6527d784481604f5 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/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 d4a11d1e..d1402124 100644
--- a/recipes-qt/qt5/qtbase/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 ec6de65fc787c8a5e782b48b6794646f274da43a 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 feb1435..6d3d1e2 100755
+index 8710c28..8b97cc2 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/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
index 79d314c5..5d7cbc34 100644
--- a/recipes-qt/qt5/qtbase/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 01653e270c4a9169a32c0002a87a6644727d0b11 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) {