summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-16 22:57:15 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-17 20:42:43 +0200
commitd82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 (patch)
tree59316aab5eb11a92368160769ef78545ddab5dfd /recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
parent1619723dfc0cdc831b71bf7ab09c4227ea544255 (diff)
downloadmeta-qt5-d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8.tar.gz
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch8
1 files changed, 4 insertions, 4 deletions
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 8224171a..9f1a2b2c 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 @@
1From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 1From 67977e16e5d0aecd931d8e4355c12cc907df592f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] Add -external-hostbindir option 4Subject: [PATCH] Add -external-hostbindir option
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
19 3 files changed, 6 insertions(+), 6 deletions(-) 19 3 files changed, 6 insertions(+), 6 deletions(-)
20 20
21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
22index a5ed8b2..0e11a1e 100644 22index 545b9a3d1e..c991a9ba41 100644
23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -50,7 +50,7 @@ index a5ed8b2..0e11a1e 100644
50 _qt5_Core_check_file_exists(${imported_location}) 50 _qt5_Core_check_file_exists(${imported_location})
51 51
52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in 52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
53index 1d94715..301af8f 100644 53index 1d947159e2..301af8f1b2 100644
54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in 54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in 55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) 56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -72,7 +72,7 @@ index 1d94715..301af8f 100644
72 _qt5_DBus_check_file_exists(${imported_location}) 72 _qt5_DBus_check_file_exists(${imported_location})
73 73
74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
75index 99d87e2..5621dc0 100644 75index 99d87e2e46..5621dc0fae 100644
76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) 78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)