path: root/src/widgets/doc
diff options
authorLiang Qi <>2017-05-29 10:06:10 +0200
committerLiang Qi <>2017-05-29 10:54:41 +0200
commit6a772fd201ac738dc86e71bd82e98f65158e6335 (patch)
tree674007720f41d27b251bbcffd7a368a93f88eb96 /src/widgets/doc
parent40206a9f6d7635bb19305d1c8d74908808e3529e (diff)
parent4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/win32-g++/qmake.conf mkspecs/win32-icc/qmake.conf src/platformsupport/fontdatabases/mac/coretext.pri src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/ Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/widgets/doc')
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/doc/src/guibooks.qdoc b/src/widgets/doc/src/guibooks.qdoc
index 5f68344758..30ffd0b5ec 100644
--- a/src/widgets/doc/src/guibooks.qdoc
+++ b/src/widgets/doc/src/guibooks.qdoc
@@ -58,7 +58,7 @@
alphabetical dictionary of widgets and other user interface elements,
with comprehensive coverage of each. Each chapter covers one widget
or other element, contains the most important recommendation from the
- Macintosh, Windows and Motif style guides, notes about common
+ \macos, Windows and Motif style guides, notes about common
problems, comparison with other widgets that can serve some of the
same roles as this one, etc.
@@ -72,7 +72,7 @@
Human Interface Guidelines}}, Second Edition, ISBN
0-201-62216-5, is worth buying for the \e {don't}s alone. Even
- if you're not writing Macintosh software, avoiding most of what it
+ if you are not writing software for \macos, avoiding most of what it
advises against will produce more easily comprehensible software.
Doing what it tells you to do may also help.