From 8f765ed71128ecc50aa7cd464be1332658df6e10 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 23 Sep 2015 16:56:26 +0200
Subject: qt5: upgrade to latest revision in 5.5 branches

* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../qt5/qtbase/0003-Add-external-hostbindir-option.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')

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 c44611d5..de8e1a4d 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
-From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 Mon Sep 17 00:00:00 2001
+From 90f3f8f59dd23f67e14c9988c2f4449a31762752 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/10] Add -external-hostbindir option
@@ -37,10 +37,10 @@ Conflicts:
  7 files changed, 37 insertions(+), 12 deletions(-)
 
 diff --git a/configure b/configure
-index dfbb111..548dd0d 100755
+index e1929e7..a757ce5 100755
 --- a/configure
 +++ b/configure
-@@ -806,6 +806,7 @@ QT_HOST_BINS=
+@@ -809,6 +809,7 @@ QT_HOST_BINS=
  QT_HOST_LIBS=
  QT_HOST_DATA=
  QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index dfbb111..548dd0d 100755
  
  #flags for SQL drivers
  QT_CFLAGS_PSQL=
-@@ -925,6 +926,7 @@ while [ "$#" -gt 0 ]; do
+@@ -928,6 +929,7 @@ while [ "$#" -gt 0 ]; do
      -testsdir| \
      -hostdatadir| \
      -hostbindir| \
@@ -56,7 +56,7 @@ index dfbb111..548dd0d 100755
      -hostlibdir| \
      -extprefix| \
      -sysroot| \
-@@ -1154,6 +1156,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do
      extprefix)
          QT_EXT_PREFIX="$VAL"
          ;;
@@ -66,7 +66,7 @@ index dfbb111..548dd0d 100755
      pkg-config)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_PKGCONFIG="$VAL"
-@@ -2380,6 +2385,10 @@ Installation options:
+@@ -2383,6 +2388,10 @@ Installation options:
      -hostdatadir <dir> . Data used by qmake will be installed to <dir>
                           (default HOSTPREFIX)
  
@@ -77,7 +77,7 @@ index dfbb111..548dd0d 100755
  Configure options:
  
   The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -3097,6 +3106,11 @@ fi
+@@ -3110,6 +3119,11 @@ fi
  # command line and environment validation
  #-------------------------------------------------------------------------------
  
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644
      _qt5_Widgets_check_file_exists(${imported_location})
  
 -- 
-2.5.0
+2.5.3
 
-- 
cgit v1.2.3-54-g00ecf