diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-02-10 15:43:15 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-11 19:26:05 +0000 |
| commit | 4bc923b6281dcbdc610133f1c47523999ef8c153 (patch) | |
| tree | dbdfc34e6a79d3824d094c62a29544b725b2b952 /src/gui/painting/qtransform.cpp | |
| parent | d55b685d237be7a6bd01b52600bcc9ffcee4e2a5 (diff) | |
QMatrix, QTransform: restore nothrow move special members
The user-defined copy assignment and (on QMatrix) copy
constructors inhibit the move special member functions.
We cannot do something about it in Qt 5, because these
classes are exported (which they shouldn't be), and
because making them trivially copyable might change
how they are passed to functions by value, so we need
to supply all the missing member functions manually.
Change-Id: I59e480d7ba02cac7e3d654cb3345f541e0701f4c
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui/painting/qtransform.cpp')
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 3e2a002148..a0596d1a07 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1011,10 +1011,11 @@ QTransform QTransform::operator*(const QTransform &m) const element of this matrix. */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! Assigns the given \a matrix's values to this matrix. */ -QTransform & QTransform::operator=(const QTransform &matrix) +QTransform & QTransform::operator=(const QTransform &matrix) Q_DECL_NOTHROW { affine._m11 = matrix.affine._m11; affine._m12 = matrix.affine._m12; @@ -1030,6 +1031,7 @@ QTransform & QTransform::operator=(const QTransform &matrix) return *this; } +#endif /*! Resets the matrix to an identity matrix, i.e. all elements are set |