diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:14:57 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 00:07:14 +0200 |
commit | 04240161ef8ec0f584c68485abc02778786c5e75 (patch) | |
tree | d02eae04e6774cbad54a3fc13e55a373a57bc549 /recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |
parent | 932b32c1c9e9a3ac833c82ff9273683345056ec7 (diff) | |
download | meta-qt5-04240161ef8ec0f584c68485abc02778786c5e75.tar.gz |
git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance
* I plan to apply this to fido branch (as well as final upgrade to 5.4.2
recipes
* I'm preparing similar patch for 5.5 revisions, which will be applied
only in master branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 4451751d..779ea918 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,4 +1,4 @@ | |||
1 | From 457efc32bb79060a0a58a82ff8a35d67655ef6d6 Mon Sep 17 00:00:00 2001 | 1 | From cf4e996876e0b467b7aae124c7cb285f677bf6b0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/12] Add -external-hostbindir option |
@@ -95,10 +95,10 @@ index 0a00d6d..ad5f4cd 100755 | |||
95 | "qt_hostspec=$shortspec", | 95 | "qt_hostspec=$shortspec", |
96 | #endif | 96 | #endif |
97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
98 | index 7961f65..e11b23d 100644 | 98 | index 79b4eab..8c6913e 100644 |
99 | --- a/mkspecs/features/qt_functions.prf | 99 | --- a/mkspecs/features/qt_functions.prf |
100 | +++ b/mkspecs/features/qt_functions.prf | 100 | +++ b/mkspecs/features/qt_functions.prf |
101 | @@ -192,7 +192,11 @@ defineTest(qtAddRpathLink) { | 101 | @@ -198,7 +198,11 @@ defineTest(qtAddRpathLink) { |
102 | defineTest(qtPrepareTool) { | 102 | defineTest(qtPrepareTool) { |
103 | cmd = $$eval(QT_TOOL.$${2}.binary) | 103 | cmd = $$eval(QT_TOOL.$${2}.binary) |
104 | isEmpty(cmd) { | 104 | isEmpty(cmd) { |
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 | |||
229 | _qt5_Widgets_check_file_exists(${imported_location}) | 229 | _qt5_Widgets_check_file_exists(${imported_location}) |
230 | 230 | ||
231 | -- | 231 | -- |
232 | 2.3.1 | 232 | 2.3.5 |
233 | 233 | ||