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_p.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_p.h')
| -rw-r--r-- | src/gui/image/qimage_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index 6f6f626858..e154ae8183 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -69,6 +69,9 @@ struct Q_GUI_EXPORT QImageData { // internal image data static QImageData *create(const QSize &size, QImage::Format format); static QImageData *create(uchar *data, int w, int h, qsizetype bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); + static QImageData *get(QImage &img) noexcept { return img.d; } + static const QImageData *get(const QImage &img) noexcept { return img.d; } + QAtomicInt ref; int width; |