diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 11:48:09 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 15:25:25 +0200 |
commit | f8b065ea1174dd1fa7d93359f6826bfc9d23174c (patch) | |
tree | 2da2a4be9b5aff64e54a818a19a8939266eed05f /recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |
parent | f52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 (diff) | |
download | meta-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/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index fc8a481e..00000000 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From a836731e94223d49ef05fdabe7905dd1b25c647c Mon Sep 17 00:00:00 2001 | ||
2 | From: Holger Freyther <zecke@selfish.org> | ||
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | ||
4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside | ||
5 | using the environment | ||
6 | |||
7 | Allow to set a qt.conf from the outside using the environment. This allows | ||
8 | to inject new prefixes and other paths into qmake. This is needed when using | ||
9 | the same qmake binary to build qt/x11 and qt/embedded | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | src/corelib/global/qlibraryinfo.cpp | 5 ++++- | ||
16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | ||
19 | index a8dc086..8138fff 100644 | ||
20 | --- a/src/corelib/global/qlibraryinfo.cpp | ||
21 | +++ b/src/corelib/global/qlibraryinfo.cpp | ||
22 | @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() | ||
23 | |||
24 | QSettings *QLibraryInfoPrivate::findConfiguration() | ||
25 | { | ||
26 | - QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); | ||
27 | + QByteArray config = getenv("QT_CONF_PATH"); | ||
28 | + QString qtconfig = QFile::decodeName(config); | ||
29 | + if(!QFile::exists(qtconfig)) | ||
30 | + qtconfig = QStringLiteral(":/qt/etc/qt.conf"); | ||
31 | #ifdef QT_BOOTSTRAPPED | ||
32 | if(!QFile::exists(qtconfig)) | ||
33 | qtconfig = qt_libraryInfoFile(); | ||
34 | -- | ||
35 | 1.8.2.1 | ||
36 | |||