GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-11 11:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Extend EIGEN_QT_SUPPORT to Qt6

Browse Source
This commit is contained in:
benardp 2021-10-23 23:43:06 +00:00 committed by Antonio Sánchez
parent 163f11e24a
commit b63c096fbb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Eigen/src/Geometry/Transform.h
View File

@ -369,9 +369,11 @@ public:
} }
#ifdef EIGEN_QT_SUPPORT #ifdef EIGEN_QT_SUPPORT
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
inline Transform(const QMatrix& other); inline Transform(const QMatrix& other);
inline Transform& operator=(const QMatrix& other); inline Transform& operator=(const QMatrix& other);
inline QMatrix toQMatrix(void) const; inline QMatrix toQMatrix(void) const;
#endif
inline Transform(const QTransform& other); inline Transform(const QTransform& other);
inline Transform& operator=(const QTransform& other); inline Transform& operator=(const QTransform& other);
inline QTransform toQTransform(void) const; inline QTransform toQTransform(void) const;
@ -734,6 +736,8 @@ typedef Transform<double,3,Projective> Projective3d;
**************************/ **************************/
#ifdef EIGEN_QT_SUPPORT #ifdef EIGEN_QT_SUPPORT
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
/** Initializes \c *this from a QMatrix assuming the dimension is 2. /** Initializes \c *this from a QMatrix assuming the dimension is 2.
* *
* This function is available only if the token EIGEN_QT_SUPPORT is defined. * This function is available only if the token EIGEN_QT_SUPPORT is defined.
@ -778,6 +782,7 @@ QMatrix Transform<Scalar,Dim,Mode,Options>::toQMatrix(void) const
m_matrix.coeff(0,1), m_matrix.coeff(1,1), m_matrix.coeff(0,1), m_matrix.coeff(1,1),
m_matrix.coeff(0,2), m_matrix.coeff(1,2)); m_matrix.coeff(0,2), m_matrix.coeff(1,2));
} }
#endif
/** Initializes \c *this from a QTransform assuming the dimension is 2. /** Initializes \c *this from a QTransform assuming the dimension is 2.
* *