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
259 lines
9.8 KiB
Plaintext
259 lines
9.8 KiB
Plaintext
<Environment>
|
|
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
|
|
<QtBuild/>
|
|
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
|
|
</Environment>
|
|
<TestFunction name="initTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_unregistered_enums">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="160">
|
|
<Description><![CDATA[Compared values are not the same]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_registered_enums">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="167">
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (Qt::Monday): Monday
|
|
Expected (Qt::Sunday): Sunday]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_class_enums">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="173">
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
|
|
Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_boolfuncs">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_to_nullptr">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_pointerfuncs">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_tostring">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="262">
|
|
<DataTag><![CDATA[int, string]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (actual) : QVariant(int,123)
|
|
Expected (expected): QVariant(QString,hi)]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[both invalid]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="262">
|
|
<DataTag><![CDATA[null hash, invalid]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (actual) : QVariant(QVariantHash)
|
|
Expected (expected): QVariant()]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="262">
|
|
<DataTag><![CDATA[string, null user type]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (actual) : QVariant(QString,A simple string)
|
|
Expected (expected): QVariant(PhonyClass)]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="262">
|
|
<DataTag><![CDATA[both non-null user type]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (actual) : QVariant(PhonyClass,<value not representable as string>)
|
|
Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQStringLists">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[empty lists]]></DataTag>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[equal lists]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="356">
|
|
<DataTag><![CDATA[last item different]]></DataTag>
|
|
<Description><![CDATA[Compared lists differ at index 2.
|
|
Actual (opA): "string3"
|
|
Expected (opB): "DIFFERS"]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="356">
|
|
<DataTag><![CDATA[second-last item different]]></DataTag>
|
|
<Description><![CDATA[Compared lists differ at index 2.
|
|
Actual (opA): "string3"
|
|
Expected (opB): "DIFFERS"]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="356">
|
|
<DataTag><![CDATA[prefix]]></DataTag>
|
|
<Description><![CDATA[Compared lists have different sizes.
|
|
Actual (opA) size: 2
|
|
Expected (opB) size: 1]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="356">
|
|
<DataTag><![CDATA[short list second]]></DataTag>
|
|
<Description><![CDATA[Compared lists have different sizes.
|
|
Actual (opA) size: 12
|
|
Expected (opB) size: 1]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="356">
|
|
<DataTag><![CDATA[short list first]]></DataTag>
|
|
<Description><![CDATA[Compared lists have different sizes.
|
|
Actual (opA) size: 1
|
|
Expected (opB) size: 12]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQListInt">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="363">
|
|
<Description><![CDATA[Compared lists differ at index 2.
|
|
Actual (int1): 3
|
|
Expected (int2): 4]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQListDouble">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="370">
|
|
<Description><![CDATA[Compared lists differ at index 0.
|
|
Actual (double1): 1.5
|
|
Expected (double2): 1]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQColor">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="380">
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (yellow): #ffff00
|
|
Expected (green) : #00ff00]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQPixmaps">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[both null]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="405">
|
|
<DataTag><![CDATA[one null]]></DataTag>
|
|
<Description><![CDATA[Compared QPixmaps differ.
|
|
Actual (opA).isNull(): 1
|
|
Expected (opB).isNull(): 0]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="405">
|
|
<DataTag><![CDATA[other null]]></DataTag>
|
|
<Description><![CDATA[Compared QPixmaps differ.
|
|
Actual (opA).isNull(): 0
|
|
Expected (opB).isNull(): 1]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[equal]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="405">
|
|
<DataTag><![CDATA[different size]]></DataTag>
|
|
<Description><![CDATA[Compared QPixmaps differ in size.
|
|
Actual (opA): 11x20
|
|
Expected (opB): 20x20]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="405">
|
|
<DataTag><![CDATA[different pixels]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQImages">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[both null]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="432">
|
|
<DataTag><![CDATA[one null]]></DataTag>
|
|
<Description><![CDATA[Compared QImages differ.
|
|
Actual (opA).isNull(): 1
|
|
Expected (opB).isNull(): 0]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="432">
|
|
<DataTag><![CDATA[other null]]></DataTag>
|
|
<Description><![CDATA[Compared QImages differ.
|
|
Actual (opA).isNull(): 0
|
|
Expected (opB).isNull(): 1]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[equal]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="432">
|
|
<DataTag><![CDATA[different size]]></DataTag>
|
|
<Description><![CDATA[Compared QImages differ in size.
|
|
Actual (opA): 11x20
|
|
Expected (opB): 20x20]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="432">
|
|
<DataTag><![CDATA[different format]]></DataTag>
|
|
<Description><![CDATA[Compared QImages differ in format.
|
|
Actual (opA): 6
|
|
Expected (opB): 3]]></Description>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="432">
|
|
<DataTag><![CDATA[different pixels]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compareQRegion">
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[equal-empty]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="455">
|
|
<DataTag><![CDATA[1-empty]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (rA): QRegion(200x50+10+10)
|
|
Expected (rB): QRegion(null)]]></Description>
|
|
</Incident>
|
|
<Incident type="pass" file="" line="0">
|
|
<DataTag><![CDATA[equal]]></DataTag>
|
|
</Incident>
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="455">
|
|
<DataTag><![CDATA[different lists]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same
|
|
Actual (rA): QRegion(200x50+10+10)
|
|
Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="verify">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="467">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="verify2">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="473">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="tryVerify">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="479">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="tryVerify2">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="485">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="verifyExplicitOperatorBool">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="cleanupTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<Duration msecs="0"/>
|