All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-qt5][PATCH] qtbase: don't pass empty filename to function
@ 2018-05-09  9:32 Samuli Piippo
  0 siblings, 0 replies; only message in thread
From: Samuli Piippo @ 2018-05-09  9:32 UTC (permalink / raw)
  To: openembedded-devel

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>
---
 ...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



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-05-09 11:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-09  9:32 [meta-qt5][PATCH] qtbase: don't pass empty filename to function Samuli Piippo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.