diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 17:39:48 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 21:22:46 +0200 |
commit | 43431619d644ebd783d292a12c1904cfd7680824 (patch) | |
tree | 7d79c2b79f6ed450613b29de700ee488d8cd99f4 /src/quick/scenegraph/util | |
parent | 7a1b5b1cfece18d5f4b2d8beb340d3cbe8f54451 (diff) | |
parent | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quick/items/qquickflickable_p_p.h
src/quick/items/qquickpathview_p_p.h
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: I77664a095d8a203e07a021c9d5953e02b8b99a1e
Diffstat (limited to 'src/quick/scenegraph/util')
-rw-r--r-- | src/quick/scenegraph/util/qsgdefaultpainternode.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp index 4dd60c76f5..561eccdb0c 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp +++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp @@ -317,7 +317,6 @@ void QSGDefaultPainterNode::updateRenderTarget() if (m_texture) delete m_texture; - texture->setTextureSize(m_size); m_texture = texture; } |