diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-27 01:00:12 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-04-27 13:50:33 +0200 |
| commit | 00ee3688133522f58a2cd0840bb98af88b04fa92 (patch) | |
| tree | 72ceb04f8c35fe48abe0befb8cc592556868bc49 /src/gui/image/qimage.h | |
| parent | 4ba25a092065a6422510a9f4afa4fbbabeda686c (diff) | |
| parent | 89dc1a1865dd8ed277b88a53262b79a93c2ba8dc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/text/qstringliteral.h
Change-Id: I1665af3ce537471b249def5e080b39bd4105189e
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index df8d2729ef..138a52ab78 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -320,6 +320,7 @@ private: friend class QRasterPlatformPixmap; friend class QBlittablePlatformPixmap; friend class QPixmapCacheEntry; + friend struct QImageData; public: typedef QImageData * DataPtr; |