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>2015-02-27 11:12:46 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 18:28:08 +0100
commit4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch)
tree8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
parentfa521467249da68e89c762a178550c8109bccae3 (diff)
downloadmeta-qt5-4d4a34c5d29ef7b730eb9da87b39f91352ef66fa.tar.gz
recipes: Refresh patches to match git recipes
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.patch30
1 files changed, 0 insertions, 30 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
deleted file mode 100644
index 83694b7d..00000000
--- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 13a61389aa33fdfd5d9a1adf824d98c5ebf1cdff 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 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8 again a bit OE specific
9---
10 tools/configure/configureapp.cpp | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
14index d0a62c8..b3f3ff8 100644
15--- a/tools/configure/configureapp.cpp
16+++ b/tools/configure/configureapp.cpp
17@@ -3384,8 +3384,8 @@ void Configure::generateQConfigPri()
18 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
19 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
20 // FIXME: add detection
21- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
22- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
23+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
24+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
25 }
26 configStream << "}" << endl;
27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
28--
292.1.3
30