diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:51:12 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:51:12 +0200 |
| commit | d8fc43efdafda01dd043c341b235ec30aca1c048 (patch) | |
| tree | 536e4855f132fdeda5a6699aac155ba472b69853 /src/core | |
| parent | c5f12acd27dee5fdec38b78a02a95cf7debfe9a5 (diff) | |
| parent | 336e0eb1bc21215012f56f725ebbfb5710d22814 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I374bd16216ab6aa9406125c8a0c084eb9cfedb61
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/resources/qresourcemanager_p.h | 8 | ||||
| -rw-r--r-- | src/core/transforms/matrix4x4_avx2.cpp | 10 | ||||
| -rw-r--r-- | src/core/transforms/matrix4x4_sse.cpp | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index b3837fb1f..ba39695a4 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -476,14 +476,14 @@ template <typename ValueType, typename KeyType, QDebug operator<<(QDebug dbg, const QResourceManager<ValueType, KeyType, LockingPolicy> &manager) { QDebugStateSaver saver(dbg); - dbg << "Contains" << manager.count() << "items" << endl; + dbg << "Contains" << manager.count() << "items" << Qt::endl; - dbg << "Key to Handle Map:" << endl; + dbg << "Key to Handle Map:" << Qt::endl; const auto end = manager.m_keyToHandleMap.cend(); for (auto it = manager.m_keyToHandleMap.cbegin(); it != end; ++it) - dbg << "QNodeId =" << it.key() << "Handle =" << it.value() << endl; + dbg << "QNodeId =" << it.key() << "Handle =" << it.value() << Qt::endl; -// dbg << "Resources:" << endl; +// dbg << "Resources:" << Qt::endl; // dbg << manager.m_handleManager; return dbg; } diff --git a/src/core/transforms/matrix4x4_avx2.cpp b/src/core/transforms/matrix4x4_avx2.cpp index 556e778d0..a06a59a99 100644 --- a/src/core/transforms/matrix4x4_avx2.cpp +++ b/src/core/transforms/matrix4x4_avx2.cpp @@ -47,12 +47,12 @@ namespace Qt3DCore { QDebug operator<<(QDebug dbg, const Matrix4x4_AVX2 &m) { - dbg.nospace() << "Matrix4x4_AVX2(" << endl + dbg.nospace() << "Matrix4x4_AVX2(" << Qt::endl << qSetFieldWidth(10) - << m.m11() << m.m12() << m.m13() << m.m14() << endl - << m.m21() << m.m22() << m.m23() << m.m24() << endl - << m.m31() << m.m32() << m.m33() << m.m34() << endl - << m.m41() << m.m42() << m.m43() << m.m44() << endl + << m.m11() << m.m12() << m.m13() << m.m14() << Qt::endl + << m.m21() << m.m22() << m.m23() << m.m24() << Qt::endl + << m.m31() << m.m32() << m.m33() << m.m34() << Qt::endl + << m.m41() << m.m42() << m.m43() << m.m44() << Qt::endl << qSetFieldWidth(0) << ')'; return dbg; } diff --git a/src/core/transforms/matrix4x4_sse.cpp b/src/core/transforms/matrix4x4_sse.cpp index d35cc2e35..bc8c57b9d 100644 --- a/src/core/transforms/matrix4x4_sse.cpp +++ b/src/core/transforms/matrix4x4_sse.cpp @@ -47,12 +47,12 @@ namespace Qt3DCore { QDebug operator<<(QDebug dbg, const Matrix4x4_SSE &m) { - dbg.nospace() << "Matrix4x4_SSE(" << endl + dbg.nospace() << "Matrix4x4_SSE(" << Qt::endl << qSetFieldWidth(10) - << m.m11() << m.m12() << m.m13() << m.m14() << endl - << m.m21() << m.m22() << m.m23() << m.m24() << endl - << m.m31() << m.m32() << m.m33() << m.m34() << endl - << m.m41() << m.m42() << m.m43() << m.m44() << endl + << m.m11() << m.m12() << m.m13() << m.m14() << Qt::endl + << m.m21() << m.m22() << m.m23() << m.m24() << Qt::endl + << m.m31() << m.m32() << m.m33() << m.m34() << Qt::endl + << m.m41() << m.m42() << m.m43() << m.m44() << Qt::endl << qSetFieldWidth(0) << ')'; return dbg; } |