summaryrefslogtreecommitdiffstats
path: root/src/doc/src/declarative/qdeclarativeperformance.qdoc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-26 13:08:12 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-26 13:08:17 +0100
commit2ce3ad556d3e0d0af585fc3e6c62e1802c26a3b8 (patch)
tree6bb24a5f67292612e2f09e9fc7875f8a715930ca /src/doc/src/declarative/qdeclarativeperformance.qdoc
parenta0783470449a911fce09d6328abfcff17973d421 (diff)
parent2bc722aedd28f004fe9a4400b24103bb7cc9716f (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Diffstat (limited to 'src/doc/src/declarative/qdeclarativeperformance.qdoc')
-rw-r--r--src/doc/src/declarative/qdeclarativeperformance.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/src/declarative/qdeclarativeperformance.qdoc b/src/doc/src/declarative/qdeclarativeperformance.qdoc
index 1aea60d2..eb8b922b 100644
--- a/src/doc/src/declarative/qdeclarativeperformance.qdoc
+++ b/src/doc/src/declarative/qdeclarativeperformance.qdoc
@@ -132,9 +132,9 @@ performance for all use-cases, it typically has \b{consistently good} performanc
all use-cases. In contrast, only using the raster paint engine may result in very good
performance for parts of your application and very poor performance elsewhere.
-The QML Viewer uses the raster graphics system by default for X11 and OS X. It also
+The QML Viewer uses the raster graphics system by default for X11 and \macos. It also
includes a \c -opengl command line option which sets a QGLWidget as the viewport of the
-view. On OS X, a QGLWidget is always used.
+view. On \macos, a QGLWidget is always used.
You can also prevent QDeclarativeView from painting its window background if
you will provide the background of your application using QML, e.g.