diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:12:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:12:53 +0100 |
| commit | 853b4b08d54f70d04d371d707e50760ffecf2f77 (patch) | |
| tree | 2220ac8be8ae9bb5b25cf560eec3dc973c09b8e8 /src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h | |
| parent | 047bdf90db4d00d0462b9faf2044070be4a0e682 (diff) | |
| parent | 87999238141588987b3cef6cd68ff62a7e3e8daa (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Change-Id: I8ede7e36592cd21f3e4a0a9b30dbe26bb40fe69b
Diffstat (limited to 'src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h')
| -rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h index f21667fdf7..5c95eb064a 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalimagenode_p.h @@ -124,8 +124,8 @@ public: QRectF rect() const; -private: const QPixmap &pixmap() const; +private: QRectF m_targetRect; QRectF m_innerTargetRect; |