diff options
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 1 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 8 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 8d6a6129e2..ae4965cbc0 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -1,4 +1,3 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQml diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 45d695bb24..42b2ec19bf 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -1,4 +1,3 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQuick @@ -60,4 +59,3 @@ sourcedirs += ../../imports #add plugins directory because of dependencies headerdirs += ../../plugins sourcedirs += ../../plugins - diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index f1cfdf8597..f03a2c9a64 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -260,7 +260,7 @@ void QQuickWindowPrivate::polishItems() * being shown on screen. This feature is very limited in what it supports. * * For this feature to be useful one needs to hook into beforeRender() - * and set the render tareget. + * and set the render target. * */ void QQuickWindowPrivate::setRenderWithoutShowing(bool render) @@ -2529,7 +2529,7 @@ uint QQuickWindow::renderTargetId() const } /*! - Returns the size of the currently set render target; otherwise returns an enpty size. + Returns the size of the currently set render target; otherwise returns an empty size. */ QSize QQuickWindow::renderTargetSize() const { @@ -2663,7 +2663,7 @@ QQmlIncubationController *QQuickWindow::incubationController() const /*! - Sets weither the scene graph rendering of QML should clear the color buffer + Sets whether the scene graph rendering of QML should clear the color buffer before it starts rendering to \a enabled. By disabling clearing of the color buffer, it is possible to do GL painting @@ -2683,7 +2683,7 @@ void QQuickWindow::setClearBeforeRendering(bool enabled) /*! - Returns weither clearing of the color buffer is done before rendering or not. + Returns whether clearing of the color buffer is done before rendering or not. */ bool QQuickWindow::clearBeforeRendering() const |