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-05-21 22:16:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 22:22:05 +0200
commit35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch)
treed640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
parent81b7031859176f24c028c7234d795812bd1a3c95 (diff)
downloadmeta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 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.patch29
1 files changed, 29 insertions, 0 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
new file mode 100644
index 00000000..a1129f79
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,29 @@
1From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8---
9 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index 57409b1..f443007 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection
20- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
21- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
22+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
23+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
24 }
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27--
281.8.2.1
29