summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_x11.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
commitcc957f4cb1a8dce2fb1eb406f54ccecb4092d238 (patch)
tree5463704092728f10a58931fba7a2a74fa71f73d0 /src/gui/kernel/qwidget_x11.cpp
parentf14620878beed97c85c4b6a03a38f485800328d1 (diff)
parent8c0cdfdd4772e81164d838b9549e8c554ecf5966 (diff)
downloadQt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.zip
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.gz
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
-rw-r--r--src/gui/kernel/qwidget_x11.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 76734d4..6202b35 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -2747,12 +2747,6 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal opacity)
32, PropModeReplace, (uchar*)&value, 1);
}
-/*!
- Returns information about the configuration of the X display used to display
- the widget.
-
- \warning This function is only available on X11.
-*/
const QX11Info &QWidget::x11Info() const
{
Q_D(const QWidget);
@@ -2789,13 +2783,6 @@ QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys()
return new QX11WindowSurface(q_func());
}
-/*!
- 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.
-*/
Qt::HANDLE QWidget::x11PictureHandle() const
{
#ifndef QT_NO_XRENDER