diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-09 12:32:19 +0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-07-12 13:49:50 -0300 |
| commit | 4b96f70a083eacfc4ff4a45d4efbb2d131f88c82 (patch) | |
| tree | 0ff232e48cd9e0fc9a0fcaa6f012177c7b44c3b8 | |
| parent | 7cec24ffd4be3db2640da2449c5f69f1da8c0c6d (diff) | |
qtbase: don't pass empty filename to function
The environment variable is empty when running qmake from SDK or
in device, which gives 'Empty filename passed to function' warning.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 65db89eb7b6a9b53f7877d6e16bc4deeb367c285)
| -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 cc0a3305..58b9dd3a 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 b4ba0b5..11d4c00 100644 - QString qtconfig = qmake_libraryInfoFile(); + QByteArray config = getenv("OE_QMAKE_QTCONF_PATH"); + QString qtconfig = QFile::decodeName(config); -+ if(!QFile::exists(qtconfig)) ++ if(qtconfig.isEmpty() || !QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); if (QFile::exists(qtconfig)) return new QSettings(qtconfig, QSettings::IniFormat); |