summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 11:48:09 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 15:25:25 +0200
commitf8b065ea1174dd1fa7d93359f6826bfc9d23174c (patch)
tree2da2a4be9b5aff64e54a818a19a8939266eed05f /recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
parentf52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 (diff)
downloadmeta-qt5-f8b065ea1174dd1fa7d93359f6826bfc9d23174c.tar.gz
qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of changes in .inc files and we have only one version of modules without release (only one _git.bb) and it's impossible to find SRCREV which would be compatible with all 4 versions. * 0005-AddSynchoronization-qimagereader.patch was already backported to 5.0.2 in upstream * 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was already applied in 5.0.2 * 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in qt5-versions.inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch29
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 @@
1From 9928daa856cd7433618df38b263e029fb9948679 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 0e01ab5..6bb7986 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (!dictionary["XQMAKESPEC"].isEmpty() && !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