aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
deleted file mode 100644
index 20e5e757..00000000
--- a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with
- SYSROOT
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- 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 cfc6f97..d0e17fa 100644
---- a/tools/configure/configureapp.cpp
-+++ b/tools/configure/configureapp.cpp
-@@ -3087,8 +3087,8 @@ void Configure::generateQConfigPri()
- configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << 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;
- }
- if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
- configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
---
-1.8.3.2
-