diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:34:21 +0100 |
| commit | 865afac25036d58b18794384e37d42931b2164c5 (patch) | |
| tree | e18d31138f1a8b9200764fd3648e58b9dd6b124f /src/gui/doc | |
| parent | 01bacdf7abb071198d843acdfb22ce1701766be8 (diff) | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb
Diffstat (limited to 'src/gui/doc')
| -rw-r--r-- | src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp index 3870237ac3..9043ee6361 100644 --- a/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp +++ b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp @@ -49,9 +49,8 @@ ****************************************************************************/ //! [0] -QPixmap* pp; QPixmap p; -if ((pp=QPixmapCache::find("my_big_image", pm))) { +if (QPixmap *pp = QPixmapCache::find("my_big_image"))) { p = *pp; } else { p.load("bigimage.png"); |