diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-28 09:16:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-28 09:16:06 +0000 |
| commit | a6f7dc521b0491a4e8a163941fedecbfdce26b43 (patch) | |
| tree | 1b1f7a085ed576892c9c6d7a1e1f0da2d427630d /src/gui/math3d/qquaternion.h | |
| parent | 73a48c16189fcc1c1dd783e05c51d47711d554e2 (diff) | |
| parent | 1c8451bdbbd6ca909dfc5b96a24be909810522fc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/math3d/qquaternion.h')
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 240e31a5c2..52c717072d 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -266,7 +266,7 @@ inline bool operator==(const QQuaternion &q1, const QQuaternion &q2) inline bool operator!=(const QQuaternion &q1, const QQuaternion &q2) { - return q1.xp != q2.xp || q1.yp != q2.yp || q1.zp != q2.zp || q1.wp != q2.wp; + return !operator==(q1, q2); } inline const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) |