818014b449
Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
230 lines
8.7 KiB
Plaintext
230 lines
8.7 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="156">
|
|
<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="162">
|
|
<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="168">
|
|
<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_pointerfuncs">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="compare_tostring">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="239">
|
|
<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="239">
|
|
<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="239">
|
|
<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="239">
|
|
<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="333">
|
|
<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="333">
|
|
<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="333">
|
|
<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="333">
|
|
<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="333">
|
|
<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="340">
|
|
<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="347">
|
|
<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="357">
|
|
<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="382">
|
|
<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="382">
|
|
<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="382">
|
|
<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="382">
|
|
<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="409">
|
|
<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="409">
|
|
<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="409">
|
|
<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="409">
|
|
<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="409">
|
|
<DataTag><![CDATA[different pixels]]></DataTag>
|
|
<Description><![CDATA[Compared values are not the same]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="verify">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="421">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="verify2">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="427">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="tryVerify">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="433">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="tryVerify2">
|
|
<Incident type="fail" file="tst_cmptest.cpp" line="439">
|
|
<Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description>
|
|
</Incident>
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<TestFunction name="cleanupTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
<Duration msecs="0"/>
|
|
</TestFunction>
|
|
<Duration msecs="0"/>
|