OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
01e112e
)
Revert "fix QIcon::fromTheme()"
author
Ivailo Monev
<xakepa10@laimg.moc>
Mon, 12 Feb 2018 20:39:49 +0000
(20:39 +0000)
committer
Ivailo Monev
<xakepa10@laimg.moc>
Mon, 12 Feb 2018 20:39:49 +0000
(20:39 +0000)
This reverts commit
e0238bd7bd7f52c158b5e6e176767be1059c2498
.
src/gui/image/qicon.cpp
patch
|
blob
|
history
diff --git
a/src/gui/image/qicon.cpp
b/src/gui/image/qicon.cpp
index
4d9fe73
..
949394d
100644
(file)
--- a/
src/gui/image/qicon.cpp
+++ b/
src/gui/image/qicon.cpp
@@
-906,7
+906,7
@@
QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback)
// Note the qapp check is to allow lazy loading of static icons
// Supporting fallbacks will not work for this case.
- if (qApp && icon.
isNull
())
+ if (qApp && icon.
availableSizes().isEmpty
())
return fallback;
return icon;