diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
| commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
| tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /src/widgets/kernel/qwidget_p.h | |
| parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
| parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'src/widgets/kernel/qwidget_p.h')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 19b7238a70..4426a6d415 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -401,9 +401,6 @@ public: const QRegion &rgn, const QPoint &offset, int flags, QPainter *sharedPainter, QWidgetBackingStore *backingStore); - - QPainter *beginSharedPainter(); - bool endSharedPainter(); #ifndef QT_NO_GRAPHICSVIEW static QGraphicsProxyWidget * nearestGraphicsProxyWidget(const QWidget *origin); #endif |