diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:13:22 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:13:22 +0300 |
| commit | 01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897 (patch) | |
| tree | 7f3349013c4744d7a70be064c3919d3c4d313800 | |
| parent | e94b0fa39a2f4bf260969fb18bf075dba39b2df1 (diff) | |
| parent | 8adc1cb84bd9a570a9ffa867ca2967a2328134de (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: Ia9b1b4ecb469827c8ad80fe53055ecaff20a2718
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/render/opengl/graphicshelpergl4/BLACKLIST | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index ce81baa81..f76bbfaea 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -6,4 +6,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 5.15.9 +MODULE_VERSION = 5.15.10 diff --git a/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp b/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp index dccf90d10..9bd3afc83 100644 --- a/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp +++ b/tests/auto/core/matrix4x4_sse/tst_matrix4x4_sse.cpp @@ -29,7 +29,9 @@ #include <QtTest/QtTest> #include <Qt3DCore/private/matrix4x4_sse_p.h> +#ifdef QT_COMPILER_SUPPORTS_SSE2 using namespace Qt3DCore; +#endif class tst_Matrix4x4_SSE: public QObject { @@ -37,6 +39,7 @@ class tst_Matrix4x4_SSE: public QObject private Q_SLOTS: +#ifdef QT_COMPILER_SUPPORTS_SSE2 void defaultConstruction() { // GIVEN @@ -520,6 +523,7 @@ private Q_SLOTS: QCOMPARE(resultingVec.toQVector3D(), tmpMat.mapVector(tmpVec3)); } } +#endif // QT_COMPILER_SUPPORTS_SSE2 }; QTEST_MAIN(tst_Matrix4x4_SSE) diff --git a/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp b/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp index 7ea79a5f5..e99dd0e6f 100644 --- a/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp +++ b/tests/auto/core/vector3d_sse/tst_vector3d_sse.cpp @@ -29,12 +29,15 @@ #include <QtTest/QtTest> #include <Qt3DCore/private/vector3d_sse_p.h> +#ifdef QT_COMPILER_SUPPORTS_SSE2 using namespace Qt3DCore; +#endif class tst_Vector3D_SSE: public QObject { Q_OBJECT private Q_SLOTS: +#ifdef QT_COMPILER_SUPPORTS_SSE2 void defaultConstruction() { // GIVEN @@ -812,6 +815,7 @@ private Q_SLOTS: QVERIFY(!v0.isNull()); } } +#endif // QT_COMPILER_SUPPORTS_SSE2 }; QTEST_APPLESS_MAIN(tst_Vector3D_SSE) diff --git a/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp b/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp index ed9722ffb..2e539491f 100644 --- a/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp +++ b/tests/auto/core/vector4d_sse/tst_vector4d_sse.cpp @@ -30,12 +30,16 @@ #include <Qt3DCore/private/vector4d_sse_p.h> #include <Qt3DCore/qt3dcore-config.h> +#ifdef QT_COMPILER_SUPPORTS_SSE2 using namespace Qt3DCore; +#endif class tst_Vector4D_SSE: public QObject { Q_OBJECT private Q_SLOTS: + +#ifdef QT_COMPILER_SUPPORTS_SSE2 void defaultConstruction() { // GIVEN @@ -915,6 +919,7 @@ private Q_SLOTS: QVERIFY(!v0.isNull()); } } +#endif // QT_COMPILER_SUPPORTS_SSE2 }; QTEST_APPLESS_MAIN(tst_Vector4D_SSE) diff --git a/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST b/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST index ab691c11c..a2da1ff1d 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST +++ b/tests/auto/render/opengl/graphicshelpergl4/BLACKLIST @@ -1,4 +1,4 @@ # See qtbase/src/testlib/qtestblacklist.cpp for format #QTBUG-101556 [bindFrameBufferAttachment] -ubuntu-20 +ubuntu-20.04 |