From d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 16 Aug 2017 22:57:15 +0200
Subject: qtbase: refresh the patches

* upload the patches to b5.8* branches on:
  https://github.com/meta-qt5/qtbase
* refresh the patches
* notice that some patches were in section which is meant to be
  common for target, native and nativesdk qtbase but were added
  only in target recipe, I've updated them to be included in all
  3, hopefully they can be used in all 3 (I don't use nativesdk at all)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...configure-paths-for-target-qmake-properly.patch | 75 ++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch

(limited to 'recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch')

diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
new file mode 100644
index 00000000..c527c131
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
@@ -0,0 +1,75 @@
+From b8e94df3d49be69659e8dfb0809c614f73c21706 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 13 Nov 2015 12:36:11 +0100
+Subject: [PATCH] configure paths for target qmake properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+to use this patch in all qtbase/qtbase-native(sdk) changes ore made
+conditionally based on QT_CROSS_COMPILE
+
+Upstream-Status: Inappropriate [OE specific]
+
+Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 5af98cd77e..34dedafe91 100755
+--- a/configure
++++ b/configure
+@@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then
+     fi
+ fi
+ 
+-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
+-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++    shortxspec=linux-g++
++    shortspec=linux-g++
++else
++    shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++    shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++fi
+ 
+ QT_CONFIGURE_STR_OFF=0
+ 
+@@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
+ 
+ QT_CONFIGURE_STR_OFFSETS=
+ QT_CONFIGURE_STRS=
+-addConfStr "$CFG_SYSROOT"
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++    addConfStr ""
++else
++    addConfStr "$CFG_SYSROOT"
++fi
+ addConfStr "$QT_REL_HOST_BINS"
+ addConfStr "$QT_REL_HOST_LIBS"
+ addConfStr "$QT_REL_HOST_DATA"
+@@ -1546,6 +1555,12 @@ addConfStr "$shortspec"
+ #-------------------------------------------------------------------------------
+ [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
+ 
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++    QT_TARGET_PREFIX=$QT_EXT_PREFIX
++else
++    QT_TARGET_PREFIX=$QT_HOST_PREFIX
++fi
++
+ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+ /* Installation date */
+ static const char qt_configure_installation          [12+11]    = "qt_instdate=2012-12-20";
+@@ -1554,7 +1569,7 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
+ static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
+ #ifdef QT_BUILD_QMAKE
+ static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
+-static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
++static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
+ #endif
+ 
+ static const short qt_configure_str_offsets[] = {
-- 
cgit v1.2.3-54-g00ecf