diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-01 01:01:28 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-01 01:01:28 +0100 |
| commit | f09fc1f35294827245e74ced48274387d5ed346f (patch) | |
| tree | 4c07e40a13fd5be82f2afe4a38165b46dd385d34 /tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | |
| parent | cc9645f11b46aaad36658d62d38a5e44a5ba5ae5 (diff) | |
| parent | f5c0a19077989b5ac14071ecd095e29f62d05602 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6f8d3abd3247dc980dc7834801a017a89c8f4286
Diffstat (limited to 'tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp')
| -rw-r--r-- | tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp index 1b818ad152..c609aa6621 100644 --- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp +++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp @@ -334,7 +334,7 @@ void tst_QCborValue::copyCompare() QCOMPARE(v, other); QVERIFY(!(v != other)); QVERIFY(!(v < other)); -#if QT_HAS_INCLUDE(<compare>) +#if 0 && QT_HAS_INCLUDE(<compare>) QVERIFY(v <= other); QVERIFY(v >= other); QVERIFY(!(v > other)); |