diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-25 03:02:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-25 03:02:14 +0200 |
| commit | e6f312aab5cdf8bc9c9c2e55931757d6d29c72cc (patch) | |
| tree | 6240d25526449dfa23306245b333098e93e39b22 | |
| parent | e92e3d36c2fdafeb713bc42164eb6dbad46e2d5b (diff) | |
| parent | d0692c6944599a5561ea07faaa6bddf98e7e2a6e (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I621a4bfeadfb6c2d3444c0071d00c403a2c4713e
| -rw-r--r-- | src/doc/src/qt3d-module.qdoc | 8 | ||||
| -rw-r--r-- | src/doc/src/qt3dscene3d-module.qdoc | 4 | ||||
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem.cpp | 2 | ||||
| -rw-r--r-- | src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/doc/src/qt3d-module.qdoc b/src/doc/src/qt3d-module.qdoc index da6ada1cc..12a2e8761 100644 --- a/src/doc/src/qt3d-module.qdoc +++ b/src/doc/src/qt3d-module.qdoc @@ -83,8 +83,8 @@ import Qt3D.Logic 2.0 import Qt3D.Extras 2.0 import Qt3D.Animation 2.9 - import Qt3D.Scene2D 2.9 - import Qt3D.Scene3D 2.9 + import QtQuick.Scene2D 2.9 + import QtQuick.Scene3D 2.0 \endcode \section1 QML Types @@ -111,9 +111,9 @@ \noautolist \section2 Qt 3D Scene2D Module - \generatelist {qmltypesbymodule Qt3D.Scene2D} + \generatelist {qmltypesbymodule QtQuick.Scene2D} \noautolist \section2 Qt 3D Scene3D Module - \generatelist {qmltypesbymodule Qt3D.Scene3D} + \generatelist {qmltypesbymodule QtQuick.Scene3D} */ diff --git a/src/doc/src/qt3dscene3d-module.qdoc b/src/doc/src/qt3dscene3d-module.qdoc index a9ae3650d..aa6939ef9 100644 --- a/src/doc/src/qt3dscene3d-module.qdoc +++ b/src/doc/src/qt3dscene3d-module.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule Qt3D.Scene3D 2.0 + \qmlmodule QtQuick.Scene3D 2.0 \preliminary \title Qt 3D Scene3D QML Types \ingroup qmlmodules @@ -37,6 +37,6 @@ To import and use the module's QML types, use the following statement: \badcode - import Qt3D.Scene3D 2.0 + import QtQuick.Scene3D 2.0 \endcode */ diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 740fda294..2f791b202 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -87,7 +87,7 @@ namespace Qt3DRender { /*! \qmltype Scene3D \inherits Item - \inqmlmodule Qt3D.Scene3D + \inqmlmodule QtQuick.Scene3D \preliminary diff --git a/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp b/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp index e793a0068..1e2035c01 100644 --- a/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp @@ -226,7 +226,7 @@ QOpenGLShaderProgram *GraphicsContext::createShaderProgram(Shader *shaderNode) const auto shaderCode = shaderNode->shaderCode(); QString logs; for (int i = QShaderProgram::Vertex; i <= QShaderProgram::Compute; ++i) { - QShaderProgram::ShaderType type = static_cast<const QShaderProgram::ShaderType>(i); + const QShaderProgram::ShaderType type = static_cast<const QShaderProgram::ShaderType>(i); if (!shaderCode.at(i).isEmpty()) { // Note: logs only return the error but not all the shader code // we could append it |