diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-02 08:54:38 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-02 08:54:38 (GMT) |
| commit | b31819a2871f0479da59c01d9fc7469d36120c2b (patch) | |
| tree | 66a52c719c144295a3adf9d6d7b4cff3a63c13ea /src/gui/image | |
| parent | d52fb58f34199e9a6e008929425cd21b92a2674a (diff) | |
| parent | d018549a25761b5e50d90939d94384f23d7a01e0 (diff) | |
| download | Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.zip Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.tar.gz Qt-b31819a2871f0479da59c01d9fc7469d36120c2b.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qicon.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 471062f..f24aeff 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -430,10 +430,13 @@ bool QPixmapIconEngine::read(QDataStream &in) in >> sz; in >> mode; in >> state; - if (pm.isNull()) + if (pm.isNull()) { addFile(fileName, sz, QIcon::Mode(mode), QIcon::State(state)); - else - addPixmap(pm, QIcon::Mode(mode), QIcon::State(state)); + } else { + QPixmapIconEngineEntry pe(fileName, sz, QIcon::Mode(mode), QIcon::State(state)); + pe.pixmap = pm; + pixmaps += pe; + } } return true; } |