diff options
| -rw-r--r-- | recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 2 |
1 files changed, 1 insertions, 1 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 e2c6ed4b..2ea9e04d 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 | |||
| @@ -29,7 +29,7 @@ index 422d08f32c..a59df4f20e 100644 | |||
| 29 | - QString qtconfig = qmake_libraryInfoFile(); | 29 | - QString qtconfig = qmake_libraryInfoFile(); |
| 30 | + QByteArray config = getenv("OE_QMAKE_QTCONF_PATH"); | 30 | + QByteArray config = getenv("OE_QMAKE_QTCONF_PATH"); |
| 31 | + QString qtconfig = QFile::decodeName(config); | 31 | + QString qtconfig = QFile::decodeName(config); |
| 32 | + if(!QFile::exists(qtconfig)) | 32 | + if(qtconfig.isEmpty() || !QFile::exists(qtconfig)) |
| 33 | + qtconfig = qmake_libraryInfoFile(); | 33 | + qtconfig = qmake_libraryInfoFile(); |
| 34 | if (QFile::exists(qtconfig)) | 34 | if (QFile::exists(qtconfig)) |
| 35 | return new QSettings(qtconfig, QSettings::IniFormat); | 35 | return new QSettings(qtconfig, QSettings::IniFormat); |