diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-02-12 08:47:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-02-12 08:47:47 +0000 |
| commit | f4a52b79ced0726b207c1af8c12ada1f8be12ff0 (patch) | |
| tree | d11ec8434ee3c61ddc1f0d04009cfc478ec05af5 /src/gui/painting/qpainter.h | |
| parent | 99da0c164b02dca8f556c3186231e6b0723c532c (diff) | |
| parent | c53f8c038c0736aeb208bcd69bf3b5e2816c29ae (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'src/gui/painting/qpainter.h')
| -rw-r--r-- | src/gui/painting/qpainter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index 77c6504d2e..205cd1dd2b 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -240,9 +240,9 @@ public: QT_DEPRECATED_X("Use setTransform() instead") void setMatrix(const QMatrix &matrix, bool combine = false); QT_DEPRECATED_X("Use transform() instead") - const QMatrix &matrix() const; + QMatrix matrix() const; QT_DEPRECATED_X("Use deviceTransform() instead") - const QMatrix &deviceMatrix() const; + QMatrix deviceMatrix() const; QT_DEPRECATED_X("Use resetTransform() instead") void resetMatrix(); #endif @@ -256,7 +256,7 @@ public: QT_DEPRECATED_X("Use setWorldTransform() instead") void setWorldMatrix(const QMatrix &matrix, bool combine = false); QT_DEPRECATED_X("Use worldTransform() instead") - const QMatrix &worldMatrix() const; + QMatrix worldMatrix() const; QT_DEPRECATED_X("Use combinedTransform() instead") QMatrix combinedMatrix() const; QT_DEPRECATED_X("Use setWorldMatrixEnabled() instead") |