summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-07-20 15:13:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-07-25 12:14:12 +0200
commit507c7466ea3a7b10a72b57ce06c3bf1ddd769037 (patch)
treedfae928f81887550f603b11d0a36993b20d96394 /recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
parent902f55b957ba0407816739bfcae864c6bd2c3d68 (diff)
downloadmeta-qt5-507c7466ea3a7b10a72b57ce06c3bf1ddd769037.tar.gz
qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index f873aae9..4562fe15 100644
--- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
1From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 1From bd192d0261e39765d895446e9d914a68a0590365 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 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with 4Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT 5 SYSROOT
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -10,10 +10,10 @@ Upstream-Status: Pending
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index 57409b1..f443007 100644 13index c752df3..0d1bca6 100644
14--- a/tools/configure/configureapp.cpp 14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp 15+++ b/tools/configure/configureapp.cpp
16@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() 16@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; 17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { 18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection 19 // FIXME: add detection
@@ -25,5 +25,5 @@ index 57409b1..f443007 100644
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) 25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; 26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27-- 27--
281.8.2.1 281.8.3.2
29 29