diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-09 09:30:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-09 07:51:49 +0000 |
| commit | 1d53b6d9f2d7d0427ff56cfa50d98ac97f99c1bc (patch) | |
| tree | d270812c4b648f51090e1262972846b1b4de8116 /src/gui/image | |
| parent | 89d0a03c067b42155b1a2d310f8514f595abfd61 (diff) | |
| parent | 5cea83a8a2fc3384bb07a7265c8d907171cb1ea4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 1d0c93f26f..27c82bc09f 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -281,7 +281,7 @@ static quint32 icon_name_hash(const char *p) QVector<const char *> QIconCacheGtkReader::lookup(const QStringRef &name) { QVector<const char *> ret; - if (!isValid()) + if (!isValid() || name.isEmpty()) return ret; QByteArray nameUtf8 = name.toUtf8(); |