summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-11 10:35:53 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-11 10:35:53 (GMT)
commita2ccdc36d0e80f7274ed0551c819bedcddc2f4cc (patch)
tree55a19156916f0668770edcec8a479609963d1779 /src/gui/kernel/qwidget.cpp
parent540092f4cc35238c258bb6422912d3eb18b26f33 (diff)
parent5299240db14579960358edeebfc72fcef905af13 (diff)
downloadQt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.zip
Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.gz
Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index cbf9585..b7c4d33 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -11420,3 +11420,17 @@ void QWidget::clearMask()
setMask(QRegion());
}
+/*! \fn const QX11Info &QWidget::x11Info() const
+ 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
+ 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.
+*/