From 4b96f70a083eacfc4ff4a45d4efbb2d131f88c82 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 May 2018 12:32:19 +0300 Subject: 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 Signed-off-by: Martin Jansa (cherry picked from commit 65db89eb7b6a9b53f7877d6e16bc4deeb367c285) --- .../0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3-54-g00ecf