diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-09-24 09:51:49 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-09-24 18:42:23 +0200 |
| commit | 8da42e1af631ffefc29fb2ef0e289dd11da376c5 (patch) | |
| tree | c20fd798ebd2e9fd7f4ea21649ec2089d4e532e4 /src | |
| parent | 9481de80b702c9b6895feb54abae32a8a96d1d19 (diff) | |
macOS: Don't pretend like our backing store is a QRasterBackingStore
We're not using the internal m_image of QRasterBackingStore, nor its
m_requestedSize, so inheriting it was just causing confusion when we
ended up in QRasterBackingStore::scroll(), operating on those members.
Pick-to: 6.2 5.15 5.12
Change-Id: I26561209c0a19777577724728f0ad62e07673577
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoabackingstore.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoabackingstore.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h index b96bb1e3dc..374dc97f7d 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.h +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -class QCocoaBackingStore : public QRasterBackingStore +class QCocoaBackingStore : public QPlatformBackingStore { protected: QCocoaBackingStore(QWindow *window); diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm index 01787da1af..994ab3036c 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QCocoaBackingStore::QCocoaBackingStore(QWindow *window) - : QRasterBackingStore(window) + : QPlatformBackingStore(window) { } |