diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:21 +0200 |
| commit | 295cd87c6d4cb6c9c1222fc565031377e5f33704 (patch) | |
| tree | 31296727d5fed266d5d894d57827c139cb555108 /src/opengl | |
| parent | 35ebdeb83eb4057f5e50042747b13d0772051459 (diff) | |
| parent | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I66c7f18a2abd13601da0947919436f7da3549ae9
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 2 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index 30b657f6db..4694f68a93 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -51,10 +51,12 @@ \snippet code/doc_src_qtopengl.cpp 0 + \if !defined(qtforpython) To link against the module, add this line to your \l qmake \c .pro file: \snippet code/doc_src_qtopengl.pro 1 + \endif The Qt OpenGL module is implemented as a platform-independent Qt/C++ wrapper around the platform-dependent GLX (version 1.3 or later), diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index e9b1258266..336d37c73f 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -57,10 +57,12 @@ \snippet code/doc_src_qtopengl.cpp 0 + \if !defined(qtforpython) To link against the module, add this line to your \l qmake \c .pro file: \snippet code/doc_src_qtopengl.pro 1 + \endif The Qt OpenGL module is implemented as a platform-independent Qt/C++ wrapper around the platform-dependent GLX (version 1.3 or later), |