diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/gui/kernel/qwindow.cpp | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 9344f18fa0..db6afe1faa 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -216,7 +216,7 @@ QWindow::~QWindow() } /*! - Set the \a surfaceType of the window. + Sets the \a surfaceType of the window. Specifies whether the window is meant for raster rendering with QBackingStore, or OpenGL rendering with QOpenGLContext. @@ -593,7 +593,7 @@ QString QWindow::filePath() const } /*! - \brief set the window's \a icon in the windowing system + \brief Sets the window's \a icon in the windowing system The window icon might be used by the windowing system for example to decorate the window, and/or in the task switcher. @@ -607,7 +607,7 @@ void QWindow::setIcon(const QIcon &icon) } /*! - \brief set the window's icon in the windowing system + \brief Sets the window's icon in the windowing system \sa setIcon() */ @@ -1223,14 +1223,14 @@ void QWindow::setPosition(int posx, int posy) /*! \fn QPoint QWindow::position() const - \brief get the position of the window on the desktop excluding any window frame + \brief Returns the position of the window on the desktop excluding any window frame \sa setPosition() */ /*! \fn QSize QWindow::size() const - \brief get the size of the window excluding any window frame + \brief Returns the size of the window excluding any window frame \sa resize() */ @@ -1309,7 +1309,7 @@ QPlatformSurface *QWindow::surfaceHandle() const } /*! - Set whether keyboard grab should be enabled or not (\a grab). + Sets whether keyboard grab should be enabled or not (\a grab). If the return value is true, the window receives all key events until setKeyboardGrabEnabled(false) is called; other windows get no key events at |