t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-04 05:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: don't pass empty filename to function

Browse Source 
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>
This commit is contained in:
Samuli Piippo
2018-05-09 12:32:19 +03:00
committed by Martin Jansa
parent 3b27896969
commit 65db89eb7b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
View File

@@ -29,7 +29,7 @@ index 422d08f32c..a59df4f20e 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);