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/widgets/kernel/qwidget.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/widgets/kernel/qwidget.cpp')
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 9195c1e5fa..1ebf782edf 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -12681,11 +12681,21 @@ void QWidget::initPainter(QPainter *painter) const painter->d_func()->state->font = f; } +/*! + \internal + + Do PaintDevice rendering with the specified \a offset. +*/ QPaintDevice *QWidget::redirected(QPoint *offset) const { return d_func()->redirected(offset); } +/*! + \internal + + A painter that is shared among other instances of QPainter. +*/ QPainter *QWidget::sharedPainter() const { // Someone sent a paint event directly to the widget @@ -12887,6 +12897,45 @@ QDebug operator<<(QDebug debug, const QWidget *widget) } #endif // !QT_NO_DEBUG_STREAM +/*! \fn Qt::HANDLE QWidget::macCGHandle() const + \internal + + Returns the CoreGraphics handle of the widget. Use of this function is not portable. + This function will return 0 if no painter context can be established, or if the handle + could not be created. + + \warning This function is only available on OS X. +*/ +/*! \fn Qt::HANDLE QWidget::macQDHandle() const + \internal + + Returns the QuickDraw handle of the widget. Use of this function is not portable. + This function will return 0 if QuickDraw is not supported, or if the handle could + not be created. + + \warning This function is only available on OS X. +*/ +/*! \fn const QX11Info &QWidget::x11Info() const + \internal + + Returns information about the configuration of the X display used to display + the widget. + + \warning This function is only available on X11. +*/ + +/*! \fn Qt::HANDLE QWidget::x11PictureHandle() const + \internal + + Returns the X11 picture handle of the widget for XRender + support. Use of this function is not portable. This function will + return 0 if XRender support is not compiled into Qt, if the + XRender extension is not supported on the X11 display, or if the + handle could not be created. + + \warning This function is only available on X11. + +*/ QT_END_NAMESPACE #include "moc_qwidget.cpp" |