From 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 27 Feb 2015 11:12:46 +0100 Subject: recipes: Refresh patches to match git recipes Signed-off-by: Martin Jansa --- ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch (limited to 'recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch') 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 @@ -From 13a61389aa33fdfd5d9a1adf824d98c5ebf1cdff Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending - again a bit OE specific ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index d0a62c8..b3f3ff8 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3384,8 +3384,8 @@ void Configure::generateQConfigPri() - configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - configStream << "}" << endl; - configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; --- -2.1.3 - -- cgit v1.2.3-54-g00ecf