summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-05-30 14:37:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:11:51 +0200
commitcf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff (patch)
treea9bd7e40b22d3ccf789a0506a4c2fc7c30593d6f /recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
parenta0da57e5ce2862758e10b82c30c200e365b29f46 (diff)
downloadmeta-qt5-cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff.tar.gz
recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index c263d094..1e5ffacf 100644
--- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
1From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001 1From 83205b1344e57e2cb0292cf1d276e40c7f45ca32 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200 3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with 4Subject: [PATCH 4/8] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT 5 SYSROOT
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -11,7 +11,7 @@ Upstream-Status: Pending
11 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
12 12
13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
14index 540708b..45f4a1e 100644 14index 7e61845..29c6358 100644
15--- a/tools/configure/configureapp.cpp 15--- a/tools/configure/configureapp.cpp
16+++ b/tools/configure/configureapp.cpp 16+++ b/tools/configure/configureapp.cpp
17@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() 17@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
@@ -26,5 +26,5 @@ index 540708b..45f4a1e 100644
26 configStream << "}" << endl; 26 configStream << "}" << endl;
27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; 27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
28-- 28--
291.9.1 292.0.0
30 30