diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:32:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:32:49 +0200 |
| commit | d75030a620274bc450f7d11edc02efab2bbf7f4e (patch) | |
| tree | a06b7b199b8fa99105610c1844584c4bbc006fcf /src/extras/defaults | |
| parent | 08bcfc398d51e0e23783a4f02623e5b27e675092 (diff) | |
| parent | d48e15d235645cbd6b08cd5fc5eb7ae84678c1fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iae5fa92dfdf8012315c043e20950368e42451e20
Diffstat (limited to 'src/extras/defaults')
| -rw-r--r-- | src/extras/defaults/qforwardrenderer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp index 7548c45c6..5bf206ede 100644 --- a/src/extras/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -280,11 +280,18 @@ QObject *QForwardRenderer::surface() const } /*! + \qmlproperty QSize ForwardRenderer::externalRenderTargetSize + + Contains the size of the external render target. External render + targets are relevant when rendering does not target a window + surface (as set in \l {surface}). +*/ +/*! \property QForwardRenderer::externalRenderTargetSize Contains the size of the external render target. External render targets are relevant when rendering does not target a window - surface (as set in \l {QForwardRenderer::surface()}{surface()}). + surface (as set in \l {surface}). */ QSize QForwardRenderer::externalRenderTargetSize() const { |