diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
| commit | 4fabebb332d8409b76e88edc74905f99119f0da4 (patch) | |
| tree | 7dff5241738b7ad5f46bdbbc0c01c2955ee1d5c1 /src/quick/scenegraph/coreapi | |
| parent | 561b9323c22a594b402eac343690898d4e9c44d0 (diff) | |
| parent | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quick/util/qquickimageprovider.cpp
Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
Diffstat (limited to 'src/quick/scenegraph/coreapi')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 633cab8078..5fb0a9867e 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -188,6 +188,9 @@ QSGMaterialShader::QSGMaterialShader() { } +/*! + \internal + */ QSGMaterialShader::QSGMaterialShader(QSGMaterialShaderPrivate &dd) : d_ptr(&dd) { @@ -463,7 +466,10 @@ QMatrix4x4 QSGMaterialShader::RenderState::combinedMatrix() const Q_ASSERT(m_data); return static_cast<const QSGRenderer *>(m_data)->currentCombinedMatrix(); } - +/*! + Returns the ratio between physical pixels and device-independent pixels + to be used for rendering. +*/ float QSGMaterialShader::RenderState::devicePixelRatio() const { Q_ASSERT(m_data); |