From 9be4b8d59328fbfc1699666ecd4d33adbab3f72c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 May 2018 13:32:07 +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. Change-Id: Ied1c6aa84614b8031bbd60fb557c235def150846 Reviewed-by: Mikko Gronoff --- .../0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5') 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 d0d5390d..83011d6c 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); -- cgit v1.2.3-54-g00ecf