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 <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 65db89eb7b)
This commit is contained in:
Samuli Piippo
2018-05-09 12:32:19 +03:00
committed by Otavio Salvador
parent 7cec24ffd4
commit 4b96f70a08

View File

@@ -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);