summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Faure <david.faure@kdab.com>2014-02-01 12:21:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-05 18:41:26 +0100
commitf0d135a6bea08bcfa1e56303d0ee9694c5bc1633 (patch)
tree2d8993532d06b315913882b3cedc5f03a8be1142
parent113cfa9aa644872f294b8e11108d269e8be758d0 (diff)
Doc: fix documentation for QWidget::windowHandle.
It's not "preliminary" anymore, and it doesn't return a QPlatformWindow, but a QWindow. Change-Id: Iaa1938728e689d97011dce8cf0d88ff8cb4a83b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--src/widgets/kernel/qwidget_qpa.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index ea6f27caf9..0a4bc990e6 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -879,9 +879,15 @@ int QWidget::metric(PaintDeviceMetric m) const
}
/*!
- \preliminary
+ If this is a native widget, return the associated QWindow.
+ Otherwise return null.
- Returns the QPlatformWindow this widget will be drawn into.
+ Native widgets include toplevel widgets, QGLWidget, and child widgets
+ on which winId() was called.
+
+ \since 5.0
+
+ \sa winId()
*/
QWindow *QWidget::windowHandle() const
{