diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/gui/kernel | |
parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformopenglcontext.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 698c26763a..fc1b537f90 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -220,7 +220,7 @@ static inline void clearFontUnlocked() For any GUI application using Qt, there is precisely \b one QGuiApplication object no matter whether the application has 0, 1, 2 or more windows at any given time. For non-GUI Qt applications, use QCoreApplication instead, - as it does not depend on the \l QtGui library. For QWidget based Qt applications, + as it does not depend on the Qt GUI module. For QWidget based Qt applications, use QApplication instead, as it provides some functionality needed for creating QWidget instances. diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 65a7ac19ef..bf3de0de8d 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -667,7 +667,7 @@ QScreen *QOpenGLContext::screen() const } /*! - internal: Needs to have a pointer to qGLContext. But since this is in QtGui we cant + internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we cant have any type information. \internal diff --git a/src/gui/kernel/qplatformopenglcontext.cpp b/src/gui/kernel/qplatformopenglcontext.cpp index 0b30884f06..f4d343d78a 100644 --- a/src/gui/kernel/qplatformopenglcontext.cpp +++ b/src/gui/kernel/qplatformopenglcontext.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE The only place to retrieve a QPlatformOpenGLContext from is through a QPlatformWindow. The context which is current for a specific thread can be collected by the currentContext() - function. This is how QPlatformOpenGLContext also makes it possible to use the QtGui module + function. This is how QPlatformOpenGLContext also makes it possible to use the Qt GUI module withhout using QOpenGLWidget. When using QOpenGLContext::currentContext(), it will ask QPlatformOpenGLContext for the currentContext. Then a corresponding QOpenGLContext will be returned, which maps to the QPlatformOpenGLContext. 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 |