diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-12 10:35:21 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-01-04 14:41:16 +0100 |
| commit | 2bee46e3f10e2c44d185d7a51a06830b68529676 (patch) | |
| tree | b65ac19203edfc2972b6020dd040e46c43b5d1fb /src/plugins/scenegraph | |
| parent | 52f7ab28172cea3710a16775b7a512fce821fc77 (diff) | |
| parent | 41293196b4db1aa7a0c616af312875c484639644 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/memory/qv4mm.cpp
src/qml/memory/qv4mmdefs_p.h
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindow_p.h
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
Change-Id: I7021fa1edf076627a67048f41f7b201220262b09
Diffstat (limited to 'src/plugins/scenegraph')
| -rw-r--r-- | src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp index 82bf9b0433..75bde2c66b 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp @@ -3046,7 +3046,7 @@ void QSGD3D12EnginePrivate::useRenderTargetAsTexture(uint id) } tframeData.activeTextures[tframeData.activeTextureCount++] = - TransientFrameData::ActiveTexture::ActiveTexture(TransientFrameData::ActiveTexture::TypeRenderTarget, id); + TransientFrameData::ActiveTexture(TransientFrameData::ActiveTexture::TypeRenderTarget, id); } QImage QSGD3D12EnginePrivate::executeAndWaitReadbackRenderTarget(uint id) |