diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index dfb6ae93..0725347a 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e4636d4d18246278fb504cff3e16321c98d1f99d Mon Sep 17 00:00:00 2001 | 1 | From 4da4d9606efc8d3109296906e5b13814499ae698 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/14] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside |
5 | using the environment | 5 | using the environment |
6 | 6 | ||
7 | Allow to set a qt.conf from the outside using the environment. This allows | 7 | Allow to set a qt.conf from the outside using the environment. This allows |
@@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded | |||
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | 12 | ||
13 | Change-Id: I0a53b713574e1860189fa52b44251eb4d19eeddc | ||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
15 | --- | 14 | --- |
16 | src/corelib/global/qlibraryinfo.cpp | 5 ++++- | 15 | src/corelib/global/qlibraryinfo.cpp | 5 ++++- |