diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-03-04 10:06:08 +0000 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-03-04 15:54:38 +0000 |
| commit | aa6c560a74cbac5758b5f2227907c1a53232070c (patch) | |
| tree | 307b5a9a873c4845594984ce7db6bf88bd016e3c /tests/auto/gui/math3d | |
| parent | 09f32728142b96fef4c7000fd757f0f18cbfaafe (diff) | |
Revert "Remove flagBits from QMatrix4x4"
This reverts commit 5ebb03c47604e0597502fbe1069de636987f33fc.
Reason for revert: Removing flagBits breaks the batchrenderer in declarative, which accesses them via QMatrix4x4_Accessor. If flagBits are still going to be removed, we need to first find a solution for the renderer.
Change-Id: Ib0a3fc7a327926f2245058c0e2ed30e8789aa75d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/gui/math3d')
| -rw-r--r-- | tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp index c39fd7f7bc..26e22e5883 100644 --- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp +++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp @@ -139,8 +139,8 @@ private slots: void convertGeneric(); -// void optimize_data(); -// void optimize(); + void optimize_data(); + void optimize(); void columnsAndRows(); @@ -2881,7 +2881,6 @@ void tst_QMatrixNxN::convertGeneric() #endif } -/* // Copy of "flagBits" in qmatrix4x4.h. enum { Identity = 0x0000, // Identity matrix @@ -3015,7 +3014,7 @@ void tst_QMatrixNxN::optimize() QCOMPARE(reinterpret_cast<Matrix4x4 *>(&m)->flagBits, flagBits); } -*/ + void tst_QMatrixNxN::columnsAndRows() { QMatrix4x4 m1(uniqueValues4); |