[oe] [meta-qt5][PATCH] qtbase: don't pass empty filename to function

Samuli Piippo samuli.piippo at qt.io
Wed May 9 09:32:19 UTC 2018


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 at qt.io>
---
 ...3-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 d0d5390..83011d6 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 422d08f..a59df4f 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);
-- 
2.17.0




More information about the Openembedded-devel mailing list