diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:52:44 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:52:44 +0200 |
commit | 781efbabf32e4438ae9c698ce498cc32cc900c57 (patch) | |
tree | fec14c84f9a61dc6579a78537f5e3daafdeab2e1 /src/qdoc/doc | |
parent | 3c5fa29f78816d8cc7fd9fa6e9462e2a9f283f64 (diff) | |
parent | a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e (diff) | |
download | qttools-781efbabf32e4438ae9c698ce498cc32cc900c57.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qdoc/doc/qdoc-manual-markupcmds.qdoc
Change-Id: I43e2d334a848397a2e619ad19aab66daff53d9b7
Diffstat (limited to 'src/qdoc/doc')
-rw-r--r-- | src/qdoc/doc/images/qt-logo.png | bin | 1495 -> 1214 bytes | |||
-rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 12 | ||||
-rw-r--r-- | src/qdoc/doc/qdoc-manual-topiccmds.qdoc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/qdoc/doc/images/qt-logo.png b/src/qdoc/doc/images/qt-logo.png Binary files differindex 6b72d5fb7..b63f1384b 100644 --- a/src/qdoc/doc/images/qt-logo.png +++ b/src/qdoc/doc/images/qt-logo.png diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index 2b78aef4e..8a3bf75a1 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -2187,7 +2187,7 @@ \image happyguy.jpg "Happy guy" Qt provides single-source portability across Microsoft - Windows, OS X, Linux, and all major commercial Unix + Windows, macOS, Linux, and all major commercial Unix variants. It is also available for embedded devices. * / \endcode @@ -2200,7 +2200,7 @@ \image happyguy.jpg image "Happy guy" Qt provides single-source portability across Microsoft - Windows, OS X, Linux, and all major commercial Unix + Windows, macOS, Linux, and all major commercial Unix variants. It is also available for embedded devices. \endquotation @@ -3291,7 +3291,7 @@ / *! Qt::HANDLE is a platform-specific handle type for system objects. This is equivalent to - \c{void *} on Windows and OS X, and to + \c{void *} on Windows and macOS, and to \c{unsigned long} on X11. \warning Using this type is not portable. @@ -3303,7 +3303,7 @@ \quotation Qt::HANDLE is a platform-specific handle type for system objects. This is equivalent to - \c{void *} on Windows and OS X, and to + \c{void *} on Windows and macOS, and to \c{unsigned long} on X11. \warning Using this type is not portable. @@ -3871,7 +3871,7 @@ \ingroup basicwidgets \meta {technology} {User Interface} - \meta {platform} {OS X 10.6} + \meta {platform} {macOS 10.6} \meta {platform} {MeeGo} \meta {audience} {user} \meta {audience} {programmer} @@ -3911,7 +3911,7 @@ <component>QtGui</component> </prodinfo> <othermeta name="platform" content="MeeGo"/> - <othermeta name="platform" content="OS X 10.6"/> + <othermeta name="platform" content="macOS 10.6"/> <othermeta name="technology" content="User Interface"/> </metadata> </prolog> diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc index fa468d83a..9fd97457d 100644 --- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc @@ -950,7 +950,7 @@ Qt is a C++ toolkit for cross-platform GUI application development. Qt provides single-source - portability across Microsoft Windows, OS X, Linux, + portability across Microsoft Windows, macOS, Linux, and all major commercial Unix variants. Qt provides application developers with all the |