summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-12-01 16:04:45 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-12-01 16:08:16 (GMT)
commitc3f22e0b7ee6358ebe063b3aeea4a609e367a5f2 (patch)
treeda3da95383dd36b6b4361c88e92e7322fa182e0d
parent5fcdba84a8546a31974e4e1ecfaf481e0b9921a5 (diff)
downloadQt-c3f22e0b7ee6358ebe063b3aeea4a609e367a5f2.zip
Qt-c3f22e0b7ee6358ebe063b3aeea4a609e367a5f2.tar.gz
Qt-c3f22e0b7ee6358ebe063b3aeea4a609e367a5f2.tar.bz2
Spelling mistakes in Documentation. There are probably more :)
Reviewed-by: paul
-rw-r--r--src/gui/kernel/qplatformintegration_qpa.cpp6
-rw-r--r--src/gui/kernel/qplatformwindow_qpa.cpp8
-rw-r--r--src/gui/kernel/qplatformwindowformat_qpa.cpp6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index 2a9bf77..9b6e590 100644
--- a/src/gui/kernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -68,7 +68,7 @@ QPlatformEventLoopIntegration *QPlatformIntegration::createEventLoopIntegration(
}
/*!
- Returns wheter the given platform integration supports OpenGL.
+ Returns whether the given platform integration supports OpenGL.
Default implementation returns false,
*/
@@ -103,7 +103,7 @@ QPlatformFontDatabase *QPlatformIntegration::fontDatabase() const
QPlatformIntegration is the single entry point for windowsystem specific functionality when
using the QPA platform. It has factory functions for creating platform specific pixmaps and
- windows. The class also controlls the font subsystem.
+ windows. The class also controls the font subsystem.
QPlatformIntegration is a singelton class which gets instansiated in the QApplication
constructor. The QPlatformIntegration instance do not have ownership of objects it creates in
@@ -147,7 +147,7 @@ QPlatformFontDatabase *QPlatformIntegration::fontDatabase() const
\fn QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const
Factory function for QWindowSurface. The QWidget parameter is a pointer to the
- top level widget(tlw) the window surface is created for. A QPlatformWindow is allways created
+ top level widget(tlw) the window surface is created for. A QPlatformWindow is always created
before the QWindowSurface for tlw where the widget also requires a WindowSurface. It is
possible to create top level QWidgets without a QWindowSurface by specifying
QPlatformWindowFormat::setWindowSurface(false) for the tlw QPlatformWindowFormat.
diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp
index 378fc68..29eaa82 100644
--- a/src/gui/kernel/qplatformwindow_qpa.cpp
+++ b/src/gui/kernel/qplatformwindow_qpa.cpp
@@ -138,7 +138,7 @@ WId QPlatformWindow::winId() const { return WId(0); }
feature in Window systems, but can be faked. When this function is called all geometry of this
platform window will be relative to the parent.
*/
-//jl: It would be usefull to have a property on the platform window which indicated if the sub-class
+//jl: It would be useful to have a property on the platform window which indicated if the sub-class
// supported the setParent. If not, then geometry would be in screen coordinates.
void QPlatformWindow::setParent(const QPlatformWindow *parent)
{
@@ -157,7 +157,7 @@ void QPlatformWindow::setWindowTitle(const QString &title) {}
void QPlatformWindow::raise() { qWarning("This plugin does not support raise()"); }
/*!
- Reimplement to be able to let Qt lower winows to the bottom of the dekstop
+ Reimplement to be able to let Qt lower windows to the bottom of the desktop
*/
void QPlatformWindow::lower() { qWarning("This plugin does not support lower()"); }
@@ -171,7 +171,7 @@ void QPlatformWindow::setOpacity(qreal level)
}
/*!
- Reimplement to return the glContext assosiated with the window.
+ Reimplement to return the glContext associated with the window.
*/
QPlatformGLContext *QPlatformWindow::glContext() const
{
@@ -194,7 +194,7 @@ QPlatformGLContext *QPlatformWindow::glContext() const
QPlatformWindow is used to signal to the windowing system, how Qt persieves its frame.
However, it is not concerned with how Qt renders into the window it represents.
- Top level QWidgets(tlw) will allways have a QPlatformWindow. However, it is not neccesary for
+ Top level QWidgets(tlw) will always have a QPlatformWindow. However, it is not necessary for
all tlw to have a QWindowSurface. This is the case for QGLWidget. And could be the case for
widgets where some 3.party renders into it.
diff --git a/src/gui/kernel/qplatformwindowformat_qpa.cpp b/src/gui/kernel/qplatformwindowformat_qpa.cpp
index ade6bb3..44b0698 100644
--- a/src/gui/kernel/qplatformwindowformat_qpa.cpp
+++ b/src/gui/kernel/qplatformwindowformat_qpa.cpp
@@ -108,8 +108,8 @@ public:
QWidget has a setter and getter function for QPlatformWindowFormat. These functions can be used
by the application programmer to signal what kind of format he wants to the window and glcontext
- should have. However, it is not allways possible to furfill these requirements. The application
- programmer should therefor check the resulting QPlatformWindowFormat from QPlatformGLContext
+ should have. However, it is not always possible to fulfill these requirements. The application
+ programmer should therefore check the resulting QPlatformWindowFormat from QPlatformGLContext
to see the format that was actually created.
A display format has several characteristics:
@@ -639,7 +639,7 @@ QPlatformGLContext *QPlatformWindowFormat::sharedGLContext() const
otherwise the QWidget will only have a QPlatformWindow.
- This is usefull for ie. QGLWidget where the QPlatformGLContext controlls the surface.
+ This is useful for ie. QGLWidget where the QPlatformGLContext controls the surface.
\sa hasOverlay()
*/