diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-08 07:02:55 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-08 07:02:55 (GMT) |
| commit | 2412b0410dcf97cf348ce703722a1b4f7ce623df (patch) | |
| tree | 6585f42a723abf192eb02b5a1788e59cdd4d562b /src | |
| parent | 5a4b17a279aaa8a0196bd645fd9095639ccb7849 (diff) | |
| download | Qt-2412b0410dcf97cf348ce703722a1b4f7ce623df.zip Qt-2412b0410dcf97cf348ce703722a1b4f7ce623df.tar.gz Qt-2412b0410dcf97cf348ce703722a1b4f7ce623df.tar.bz2 | |
qdoc: Moved platform-specific qdoc comments to common .cpp file.
When building docs for the mac, qdoc comments for functions defined
in the .h file were not found in any of the .cpp files in the mac
package because they were in the x11 or windows .cpp file. So I
moved them to a .cpp file that is in all the packages.
Task-number: 252496 252492
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 14 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 13 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index b96d8b3..d911b48 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11432,3 +11432,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. +*/ 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 |