diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-03 17:08:57 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-07 20:05:41 +0100 |
| commit | e14e5e104d17d498378dc24645124900e8c419f4 (patch) | |
| tree | f6fa7c736d775fc746f31c265b9da9b229c85f6d /src/gui/painting/qpainter.cpp | |
| parent | 1c571e5fe7a31e7accb04b37a1d3bd7c8855d05c (diff) | |
Replace the QMatrix field of QTransform with qreal[3][3]
Remove temporarily the reference returned by QTransform::toAffine()
since we don't keep the QMatrix object internally anymore.
This is done in order to compile the rest of the code.
The follow-up patch is going to remove that method completely.
Task-number: QTBUG-81628
Change-Id: If7140eedb7582d81ac8da529017cf792174e86ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 8aedf2c34d..6867b34b46 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -2958,7 +2958,7 @@ void QPainter::setWorldMatrix(const QMatrix &matrix, bool combine) {Coordinate System} */ -const QMatrix &QPainter::worldMatrix() const +QMatrix QPainter::worldMatrix() const { Q_D(const QPainter); if (!d->engine) { @@ -2989,7 +2989,7 @@ void QPainter::setMatrix(const QMatrix &matrix, bool combine) \sa worldTransform() */ -const QMatrix &QPainter::matrix() const +QMatrix QPainter::matrix() const { QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -3035,7 +3035,7 @@ QMatrix QPainter::combinedMatrix() const \sa worldMatrix(), QPaintEngine::hasFeature(), */ -const QMatrix &QPainter::deviceMatrix() const +QMatrix QPainter::deviceMatrix() const { Q_D(const QPainter); if (!d->engine) { |