summaryrefslogtreecommitdiffstats
path: root/src/opengl/doc/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-13 01:05:02 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-13 01:05:02 +0200
commit6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch)
tree545dac994ef985cc91d92fa77da21581b6762c86 /src/opengl/doc/src
parentd04982dc84d66bec92b4b3767538676cf925ef17 (diff)
parentd9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/opengl/doc/src')
-rw-r--r--src/opengl/doc/src/qtopengl-index.qdoc2
-rw-r--r--src/opengl/doc/src/qtopengl-module.qdoc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc
index ae12fb8137..6ab888a14d 100644
--- a/src/opengl/doc/src/qtopengl-index.qdoc
+++ b/src/opengl/doc/src/qtopengl-index.qdoc
@@ -37,7 +37,7 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only
deals with 3D rendering and provides little or no support for GUI
programming issues. The user interface for an OpenGL application
- must be created with another toolkit, such as Cocoa on the OS X
+ must be created with another toolkit, such as Cocoa on the \macos
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.
diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc
index 8722a9f972..e9b1258266 100644
--- a/src/opengl/doc/src/qtopengl-module.qdoc
+++ b/src/opengl/doc/src/qtopengl-module.qdoc
@@ -40,7 +40,7 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only
deals with 3D rendering and provides little or no support for GUI
programming issues. The user interface for an OpenGL application
- must be created with another toolkit, such as Cocoa on the OS X
+ must be created with another toolkit, such as Cocoa on the \macos
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.