summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2019-08-21 15:16:22 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2019-08-22 09:44:20 +0200
commit68cc2c2779aa8f75c14415ecbd19a9c6fdee6ac5 (patch)
treecc3066f01d5c55bc965abb2deb06cd7c7a6e461c /src/widgets/kernel/qwidget.cpp
parentc937f80fe5f8c13ef99882ba96b11fbea0cba156 (diff)
widgets: Don't rely on QWidget friending QWidgetRepaintManager
Change-Id: Id9fc28eb62103d38eaa51261f61a2294db85e0d6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
-rw-r--r--src/widgets/kernel/qwidget.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 00d91a13c9..d098d9cc04 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -11840,9 +11840,9 @@ void QWidget::setBackingStore(QBackingStore *store)
return;
if (isTopLevel()) {
- if (repaintManager->store != oldStore && repaintManager->store != store)
- delete repaintManager->store;
- repaintManager->store = store;
+ if (repaintManager->backingStore() != oldStore && repaintManager->backingStore() != store)
+ delete repaintManager->backingStore();
+ repaintManager->setBackingStore(store);
}
}
@@ -11859,7 +11859,7 @@ QBackingStore *QWidget::backingStore() const
return extra->backingStore;
QWidgetRepaintManager *repaintManager = d->maybeRepaintManager();
- return repaintManager ? repaintManager->store : nullptr;
+ return repaintManager ? repaintManager->backingStore() : nullptr;
}
void QWidgetPrivate::getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const