diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-21 19:34:01 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-22 14:35:29 +0000 |
| commit | ef5f5d912da50e43015de0e7fecb482a7cd4a2fd (patch) | |
| tree | 8f89fe21421a93ffd0141c5743d1cd67d4961bcd /recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |
| parent | 820f3ef827b874340e9e42000657a110c9a99440 (diff) | |
qt5: upgrade to 5.11.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 2ea9e04d..2450f7ef 100644 --- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From b5dac69f4309950b828566002d07662b77e34097 Mon Sep 17 00:00:00 2001 +From 1fce658543816f654c6b4abcf02b6190189ba3b7 Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -13,13 +13,14 @@ Upstream-Status: Inappropriate [embedded specific] qmake from sstate and replacing all configured paths in it with qt.conf from environment). +Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 422d08f32c..a59df4f20e 100644 +index 422d08f32c..cb092301fa 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -172,7 +172,10 @@ void QLibrarySettings::load() |