diff options
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 | 9 |
1 files changed, 3 insertions, 6 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 3884c9cc..0b0650d3 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,8 +1,8 @@ | |||
1 | From 0d1049d3097f674260622adeb9ae8c5f4d6d0a44 Mon Sep 17 00:00:00 2001 | 1 | From 1edd17d452a7e9eeb2931b3c5697a4fc0ec4e6bc 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] qlibraryinfo: allow to set qt.conf from the outside using the |
5 | using the environment | 5 | 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 |
8 | to inject new prefixes and other paths into qmake. This is needed when using | 8 | to inject new prefixes and other paths into qmake. This is needed when using |
@@ -34,6 +34,3 @@ index 8bcacca..e1c87b5 100644 | |||
34 | if (QFile::exists(qtconfig)) | 34 | if (QFile::exists(qtconfig)) |
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 | -- | ||
38 | 2.7.1 | ||
39 | |||