diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /src/gui/painting/qbackingstore.cpp | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'src/gui/painting/qbackingstore.cpp')
| -rw-r--r-- | src/gui/painting/qbackingstore.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 4136c29d4e..68ed3eae6e 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -235,16 +235,27 @@ bool QBackingStore::scroll(const QRegion &area, int dx, int dy) return d_ptr->platformBackingStore->scroll(QHighDpi::toNativeLocalRegion(area, d_ptr->window), QHighDpi::toNativePixels(dx, d_ptr->window), QHighDpi::toNativePixels(dy, d_ptr->window)); } +/*! + Set \a region as the static contents of this window. +*/ void QBackingStore::setStaticContents(const QRegion ®ion) { d_ptr->staticContents = region; } +/*! + Returns a pointer to the QRegion that has the static contents + of this window. +*/ QRegion QBackingStore::staticContents() const { return d_ptr->staticContents; } +/*! + Returns a boolean indicating if this window + has static contents or not. +*/ bool QBackingStore::hasStaticContents() const { return !d_ptr->staticContents.isEmpty(); @@ -297,6 +308,9 @@ void Q_GUI_EXPORT qt_scrollRectInImage(QImage &img, const QRect &rect, const QPo } } +/*! + Returns a pointer to the QPlatformBackingStore implementation +*/ QPlatformBackingStore *QBackingStore::handle() const { return d_ptr->platformBackingStore; |