diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:09:14 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 12:11:33 +0200 |
| commit | f523419291a0c0460d7b747cdaef92d1dd9cd8d8 (patch) | |
| tree | e24c7f59fa5312cc515294e30e4492d9753a5f45 /src/extras | |
| parent | 4c03c1f640b6e8877990e587d46696e0fe19e312 (diff) | |
| parent | 06010d41368cd2f7e31fc13b98ac465886dc77a1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Id34a7e40a1bd8f5bfbf87d3f3c06129bdfaebdf1
Diffstat (limited to 'src/extras')
| -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 e05126a23..22a471cec 100644 --- a/src/extras/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -303,11 +303,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 { |