782ebeada1
Conflicts: qmake/library/qmakebuiltins.cpp qmake/library/qmakeevaluator.cpp qmake/library/qmakeevaluator.h qmake/project.h QMakeEvaluator: * evaluateConditional(): one side changed return type, the other changed a parameter type. * split_value_list(): one side changed a parameter adjacent to where ... * expandVariableReferences(): ... the other killed one overload and changed the survivor src/corelib/io/qlockfile_unix.cpp One side changed a #if condition, the other moved NETBSD's part of what it controlled. src/corelib/tools/qdatetime.cpp One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the other moved it from the private class to the public one, in the midst of the "short date-time" optimization, which confused diff entirely. One side changed a QStringLiteral to QLatin1String, the other rewrote adjoining code. src/network/kernel/qauthenticator.cpp Both rewrote a line, equivalently; kept the dev version. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h One side changed #if-ery that the other removed. tools/configure/configureapp.cpp One side added a check to -target parsing; the other killed -target. tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml tests/auto/testlib/selftests/expected_cmptest.xunitxml Regenerated using generate_expected_output.py I note that quite a few other expected_* come out changed, now. There was no git-conflict in src/widgets/kernel/qformlayout.cpp but it didn't compile; one side removed some unused methods; the other found uses for one of them. Put FixedColumnMatrix<>::removeRow(int) back for its new user. Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584
122 lines
5.8 KiB
XML
122 lines
5.8 KiB
XML
<?xml version="1.0" encoding="UTF-8" ?>
|
|
<testsuite errors="0" failures="30" tests="21" name="tst_Cmptest">
|
|
<properties>
|
|
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
|
|
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
|
|
<property value="" name="QtBuild"/>
|
|
</properties>
|
|
<testcase result="pass" name="initTestCase"/>
|
|
<testcase result="fail" name="compare_unregistered_enums">
|
|
<failure message="Compared values are not the same" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compare_registered_enums">
|
|
<failure message="Compared values are not the same
|
|
Actual (Qt::Monday): Monday
|
|
Expected (Qt::Sunday): Sunday" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compare_class_enums">
|
|
<failure message="Compared values are not the same
|
|
Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
|
|
Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2" result="fail"/>
|
|
</testcase>
|
|
<testcase result="pass" name="compare_boolfuncs"/>
|
|
<testcase result="pass" name="compare_to_nullptr"/>
|
|
<testcase result="pass" name="compare_pointerfuncs"/>
|
|
<testcase result="fail" name="compare_tostring">
|
|
<failure tag="int, string" message="Compared values are not the same
|
|
Actual (actual) : QVariant(int,123)
|
|
Expected (expected): QVariant(QString,hi)" result="fail"/>
|
|
<failure tag="null hash, invalid" message="Compared values are not the same
|
|
Actual (actual) : QVariant(QVariantHash)
|
|
Expected (expected): QVariant()" result="fail"/>
|
|
<failure tag="string, null user type" message="Compared values are not the same
|
|
Actual (actual) : QVariant(QString,A simple string)
|
|
Expected (expected): QVariant(PhonyClass)" result="fail"/>
|
|
<failure tag="both non-null user type" message="Compared values are not the same
|
|
Actual (actual) : QVariant(PhonyClass,<value not representable as string>)
|
|
Expected (expected): QVariant(PhonyClass,<value not representable as string>)" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQStringLists">
|
|
<failure tag="last item different" message="Compared lists differ at index 2.
|
|
Actual (opA): "string3"
|
|
Expected (opB): "DIFFERS"" result="fail"/>
|
|
<failure tag="second-last item different" message="Compared lists differ at index 2.
|
|
Actual (opA): "string3"
|
|
Expected (opB): "DIFFERS"" result="fail"/>
|
|
<failure tag="prefix" message="Compared lists have different sizes.
|
|
Actual (opA) size: 2
|
|
Expected (opB) size: 1" result="fail"/>
|
|
<failure tag="short list second" message="Compared lists have different sizes.
|
|
Actual (opA) size: 12
|
|
Expected (opB) size: 1" result="fail"/>
|
|
<failure tag="short list first" message="Compared lists have different sizes.
|
|
Actual (opA) size: 1
|
|
Expected (opB) size: 12" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQListInt">
|
|
<failure message="Compared lists differ at index 2.
|
|
Actual (int1): 3
|
|
Expected (int2): 4" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQListDouble">
|
|
<failure message="Compared lists differ at index 0.
|
|
Actual (double1): 1.5
|
|
Expected (double2): 1" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQColor">
|
|
<failure message="Compared values are not the same
|
|
Actual (yellow): #ffff00
|
|
Expected (green) : #00ff00" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQPixmaps">
|
|
<failure tag="one null" message="Compared QPixmaps differ.
|
|
Actual (opA).isNull(): 1
|
|
Expected (opB).isNull(): 0" result="fail"/>
|
|
<failure tag="other null" message="Compared QPixmaps differ.
|
|
Actual (opA).isNull(): 0
|
|
Expected (opB).isNull(): 1" result="fail"/>
|
|
<failure tag="different size" message="Compared QPixmaps differ in size.
|
|
Actual (opA): 11x20
|
|
Expected (opB): 20x20" result="fail"/>
|
|
<failure tag="different pixels" message="Compared values are not the same" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQImages">
|
|
<failure tag="one null" message="Compared QImages differ.
|
|
Actual (opA).isNull(): 1
|
|
Expected (opB).isNull(): 0" result="fail"/>
|
|
<failure tag="other null" message="Compared QImages differ.
|
|
Actual (opA).isNull(): 0
|
|
Expected (opB).isNull(): 1" result="fail"/>
|
|
<failure tag="different size" message="Compared QImages differ in size.
|
|
Actual (opA): 11x20
|
|
Expected (opB): 20x20" result="fail"/>
|
|
<failure tag="different format" message="Compared QImages differ in format.
|
|
Actual (opA): 6
|
|
Expected (opB): 3" result="fail"/>
|
|
<failure tag="different pixels" message="Compared values are not the same" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="compareQRegion">
|
|
<failure tag="1-empty" message="Compared values are not the same
|
|
Actual (rA): QRegion(200x50+10+10)
|
|
Expected (rB): QRegion(null)" result="fail"/>
|
|
<failure tag="different lists" message="Compared values are not the same
|
|
Actual (rA): QRegion(200x50+10+10)
|
|
Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="verify">
|
|
<failure message="'opaqueFunc() < 2' returned FALSE. ()" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="verify2">
|
|
<failure message="'opaqueFunc() < 2' returned FALSE. (42)" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="tryVerify">
|
|
<failure message="'opaqueFunc() < 2' returned FALSE. ()" result="fail"/>
|
|
</testcase>
|
|
<testcase result="fail" name="tryVerify2">
|
|
<failure message="'opaqueFunc() < 2' returned FALSE. (42)" result="fail"/>
|
|
</testcase>
|
|
<testcase result="pass" name="verifyExplicitOperatorBool"/>
|
|
<testcase result="pass" name="cleanupTestCase"/>
|
|
<system-err/>
|
|
</testsuite>
|