summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qdesktopwidget.qdoc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-07-01 09:59:28 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-07-01 09:59:28 +0000
commit0698f876ca02b85c1e584b72cac3444796f6a355 (patch)
tree022748fb34278fb455d8e029d912dfb0b545f443 /src/widgets/kernel/qdesktopwidget.qdoc
parentcd297f99a2ce9c53c3ac4633bdf2425af364a1bc (diff)
parent0aa2d318b1524cdab42ab9988270779ddcc1922a (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel/qdesktopwidget.qdoc')
-rw-r--r--src/widgets/kernel/qdesktopwidget.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc
index 6ce312dc2f..31a99f1acb 100644
--- a/src/widgets/kernel/qdesktopwidget.qdoc
+++ b/src/widgets/kernel/qdesktopwidget.qdoc
@@ -149,7 +149,7 @@
Returns the available geometry of the screen with index \a screen. What
is available will be subrect of screenGeometry() based on what the
platform decides is available (for example excludes the dock and menu bar
- on Mac OS X, or the task bar on Windows). The default screen is used if
+ on OS X, or the task bar on Windows). The default screen is used if
\a screen is -1.
\sa screenNumber(), screenGeometry()