diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-08 13:32:07 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-09 06:15:44 +0000 |
| commit | 9be4b8d59328fbfc1699666ecd4d33adbab3f72c (patch) | |
| tree | 1021d7805be563dad37639045c6f926638ef66b7 | |
| parent | 2987d74f3b610d36ddd743f840c15e2ccb64aaa3 (diff) | |
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 <mikko.gronoff@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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); |