diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index c40c66b1..00000000 --- a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9928daa856cd7433618df38b263e029fb9948679 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/12] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending ---- - 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 0e01ab5..6bb7986 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; - if (!dictionary["XQMAKESPEC"].isEmpty() && !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.2.1 - |