diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 14:50:16 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 13:08:53 +0200 |
commit | 89038bffd224a0d43aa8627472374503b3023f61 (patch) | |
tree | f618d1b35f469cb667619274989748b0d5e2c0c1 /recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |
parent | 37693b5357e790665bce4957cb7a8d5d2423390d (diff) | |
download | meta-qt5-jansa/jethro.tar.gz |
qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethro
* this is probably last upgrade for jethro branch, master will switch
to 5.6 soon
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 | 4 |
1 files changed, 2 insertions, 2 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 index 800d42a8..c5f14c9d 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9e987abf08c5841fcce3331aceec51e00a26dcc8 Mon Sep 17 00:00:00 2001 | 1 | From f15c77264cc3ee82cba4127e58be4f6401b791f6 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside |
@@ -35,5 +35,5 @@ index 0cfcc4e..c3b5c2d 100644 | |||
35 | return new QSettings(qtconfig, QSettings::IniFormat); | 35 | return new QSettings(qtconfig, QSettings::IniFormat); |
36 | #ifdef QT_BUILD_QMAKE | 36 | #ifdef QT_BUILD_QMAKE |
37 | -- | 37 | -- |
38 | 2.5.3 | 38 | 2.6.1 |
39 | 39 | ||