summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-06-25 15:47:15 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-06 19:45:44 +0200
commitb26453cd28ed913d68e6ab2a0da0a13b1ce40098 (patch)
tree0296514f3790e3d4c6226b5f676f6cd28f8db3d9 /recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
parent0d9ca1b1bd06a9f2221cbfd6b7364c74fd20f21a (diff)
downloadmeta-qt5-b26453cd28ed913d68e6ab2a0da0a13b1ce40098.tar.gz
recipes: upgrade from 5.3.0 to 5.3.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index d24e193d..db6266d0 100644
--- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,19 +1,20 @@
1From 15b871b694cead18fcb750c0bb393440ea929e06 Mon Sep 17 00:00:00 2001 1From 4a86d338f04c2bfa4d3f63a2fa9d1252503757fd 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/17] configureapp: Prefix default LIBDIRS and INCDIRS with 4Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT 5 SYSROOT
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 again a bit OE specific
8--- 9---
9 tools/configure/configureapp.cpp | 4 ++-- 10 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
11 12
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index eb472db..808c8dd 100644 14index 7e61845..29c6358 100644
14--- a/tools/configure/configureapp.cpp 15--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp 16+++ b/tools/configure/configureapp.cpp
16@@ -3344,8 +3344,8 @@ void Configure::generateQConfigPri() 17@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
17 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; 18 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { 19 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection 20 // FIXME: add detection