diff options
Diffstat (limited to 'tests/auto/testlib/selftests')
52 files changed, 90 insertions, 70 deletions
diff --git a/tests/auto/testlib/selftests/alive/alive.pro b/tests/auto/testlib/selftests/alive/alive.pro index f4c18d54fa..d3df09b10d 100644 --- a/tests/auto/testlib/selftests/alive/alive.pro +++ b/tests/auto/testlib/selftests/alive/alive.pro @@ -6,4 +6,3 @@ CONFIG -= debug_and_release_target TARGET = alive -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/assert/assert.pro b/tests/auto/testlib/selftests/assert/assert.pro index 0930724059..cfc6a0c6b3 100644 --- a/tests/auto/testlib/selftests/assert/assert.pro +++ b/tests/auto/testlib/selftests/assert/assert.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = assert -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/badxml/badxml.pro b/tests/auto/testlib/selftests/badxml/badxml.pro index 6c5e6320f8..7b3b0f701c 100644 --- a/tests/auto/testlib/selftests/badxml/badxml.pro +++ b/tests/auto/testlib/selftests/badxml/badxml.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = badxml -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro index f0cfecd4ff..6cbefe518c 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro +++ b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = benchlibcallgrind -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/benchlibcounting/benchlibcounting.pro b/tests/auto/testlib/selftests/benchlibcounting/benchlibcounting.pro index d3c841f0d5..b495995eac 100644 --- a/tests/auto/testlib/selftests/benchlibcounting/benchlibcounting.pro +++ b/tests/auto/testlib/selftests/benchlibcounting/benchlibcounting.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = benchlibcounting -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro index 5c38140bc4..5e2b963491 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro +++ b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = benchlibeventcounter -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro index 77dcf853e9..f4bcc92129 100644 --- a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro +++ b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = benchliboptions -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro index 5763b8dc32..ce0ec7012c 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro +++ b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro @@ -6,4 +6,3 @@ CONFIG -= debug_and_release_target TARGET = benchlibtickcounter -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro index 2faa7585ac..0e689871ab 100644 --- a/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro +++ b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro @@ -6,4 +6,3 @@ CONFIG -= debug_and_release_target TARGET = benchlibwalltime -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/cmptest/cmptest.pro b/tests/auto/testlib/selftests/cmptest/cmptest.pro index e8e467dc8a..a793c203dd 100644 --- a/tests/auto/testlib/selftests/cmptest/cmptest.pro +++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = cmptest -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index 6506479d1d..e9ad1778fa 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -136,6 +136,8 @@ private slots: void compare_tostring_data(); void compareQStringLists(); void compareQStringLists_data(); + void compareQListInt(); + void compareQListDouble(); void compareQPixmaps(); void compareQPixmaps_data(); void compareQImages(); @@ -307,6 +309,20 @@ void tst_Cmptest::compareQStringLists() QCOMPARE(opA, opB); } +void tst_Cmptest::compareQListInt() +{ + QList<int> int1; int1 << 1 << 2 << 3; + QList<int> int2; int2 << 1 << 2 << 4; + QCOMPARE(int1, int2); +} + +void tst_Cmptest::compareQListDouble() +{ + QList<double> double1; double1 << 1.5 << 2 << 3; + QList<double> double2; double2 << 1 << 2 << 4; + QCOMPARE(double1, double2); +} + void tst_Cmptest::compareQPixmaps_data() { QTest::addColumn<QPixmap>("opA"); diff --git a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro index d1ed7143a6..056388333a 100644 --- a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro +++ b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = commandlinedata -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/counting/counting.pro b/tests/auto/testlib/selftests/counting/counting.pro index e9c53ed3b4..8aa2fe5753 100644 --- a/tests/auto/testlib/selftests/counting/counting.pro +++ b/tests/auto/testlib/selftests/counting/counting.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = counting -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/crashes/crashes.pro b/tests/auto/testlib/selftests/crashes/crashes.pro index 80b438fb5e..25e24243d1 100644 --- a/tests/auto/testlib/selftests/crashes/crashes.pro +++ b/tests/auto/testlib/selftests/crashes/crashes.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = crashes -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/datatable/datatable.pro b/tests/auto/testlib/selftests/datatable/datatable.pro index 2b8e368497..72fa851ae6 100644 --- a/tests/auto/testlib/selftests/datatable/datatable.pro +++ b/tests/auto/testlib/selftests/datatable/datatable.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = datatable -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/datetime/datetime.pro b/tests/auto/testlib/selftests/datetime/datetime.pro index 94d34bfcad..d65c59354f 100644 --- a/tests/auto/testlib/selftests/datetime/datetime.pro +++ b/tests/auto/testlib/selftests/datetime/datetime.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = datetime -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp index 25e50df72a..39ba9f5908 100644 --- a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp +++ b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp @@ -69,7 +69,7 @@ void tst_DateTime::qurl() const { QFETCH(QUrl, operandA); QFETCH(QUrl, operandB); - + QCOMPARE(operandA, operandB); } diff --git a/tests/auto/testlib/selftests/differentexec/differentexec.pro b/tests/auto/testlib/selftests/differentexec/differentexec.pro index ba7fc5bedd..7f148ba996 100644 --- a/tests/auto/testlib/selftests/differentexec/differentexec.pro +++ b/tests/auto/testlib/selftests/differentexec/differentexec.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = differentexec -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro index 76000ce7db..fe89f6f3cd 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro +++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro @@ -6,4 +6,3 @@ CONFIG -= debug_and_release_target CONFIG += exceptions TARGET = exceptionthrow -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index 83b2e6e137..54c5bb85f0 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -49,35 +49,49 @@ </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[last item different]]></DataTag> - <Description><![CDATA[Compared QStringLists differ at index 2. + <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[second-last item different]]></DataTag> - <Description><![CDATA[Compared QStringLists differ at index 2. + <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[prefix]]></DataTag> - <Description><![CDATA[Compared QStringLists have different sizes. + <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '2' Expected (opB) size: '1']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[short list second]]></DataTag> - <Description><![CDATA[Compared QStringLists have different sizes. + <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '12' Expected (opB) size: '1']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[short list first]]></DataTag> - <Description><![CDATA[Compared QStringLists have different sizes. + <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '1' Expected (opB) size: '12']]></Description> </Incident> </TestFunction> +<TestFunction name="compareQListInt"> +<Incident type="fail" file="tst_cmptest.cpp" line="316"> + <Description><![CDATA[Compared lists differ at index 2. + Actual (int1): '3' + Expected (int2): '4']]></Description> +</Incident> +</TestFunction> +<TestFunction name="compareQListDouble"> +<Incident type="fail" file="tst_cmptest.cpp" line="323"> + <Description><![CDATA[Compared lists differ at index 0. + Actual (double1): '1.5' + Expected (double2): '1']]></Description> +</Incident> +</TestFunction> <TestFunction name="compareQPixmaps"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index de666ed8b1..d41da53b06 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -22,26 +22,34 @@ FAIL! : tst_Cmptest::compare_tostring(both non-null user type) Compared values Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(214)] PASS : tst_Cmptest::compareQStringLists(empty lists) PASS : tst_Cmptest::compareQStringLists(equal lists) -FAIL! : tst_Cmptest::compareQStringLists(last item different) Compared QStringLists differ at index 2. +FAIL! : tst_Cmptest::compareQStringLists(last item different) Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS' Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] -FAIL! : tst_Cmptest::compareQStringLists(second-last item different) Compared QStringLists differ at index 2. +FAIL! : tst_Cmptest::compareQStringLists(second-last item different) Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS' Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] -FAIL! : tst_Cmptest::compareQStringLists(prefix) Compared QStringLists have different sizes. +FAIL! : tst_Cmptest::compareQStringLists(prefix) Compared lists have different sizes. Actual (opA) size: '2' Expected (opB) size: '1' Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] -FAIL! : tst_Cmptest::compareQStringLists(short list second) Compared QStringLists have different sizes. +FAIL! : tst_Cmptest::compareQStringLists(short list second) Compared lists have different sizes. Actual (opA) size: '12' Expected (opB) size: '1' Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] -FAIL! : tst_Cmptest::compareQStringLists(short list first) Compared QStringLists have different sizes. +FAIL! : tst_Cmptest::compareQStringLists(short list first) Compared lists have different sizes. Actual (opA) size: '1' Expected (opB) size: '12' Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(308)] +FAIL! : tst_Cmptest::compareQListInt() Compared lists differ at index 2. + Actual (int1): '3' + Expected (int2): '4' + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(316)] +FAIL! : tst_Cmptest::compareQListDouble() Compared lists differ at index 0. + Actual (double1): '1.5' + Expected (double2): '1' + Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(323)] PASS : tst_Cmptest::compareQPixmaps(both null) FAIL! : tst_Cmptest::compareQPixmaps(one null) Compared QPixmaps differ. Actual (opA).isNull(): 1 @@ -79,5 +87,5 @@ FAIL! : tst_Cmptest::compareQImages(different format) Compared QImages differ i FAIL! : tst_Cmptest::compareQImages(different pixels) Compared values are not the same Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(360)] PASS : tst_Cmptest::cleanupTestCase() -Totals: 11 passed, 18 failed, 0 skipped +Totals: 11 passed, 20 failed, 0 skipped ********* Finished testing of tst_Cmptest ********* diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index 0e5b6de335..ccab93d7c0 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -51,35 +51,49 @@ </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[last item different]]></DataTag> - <Description><![CDATA[Compared QStringLists differ at index 2. + <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[second-last item different]]></DataTag> - <Description><![CDATA[Compared QStringLists differ at index 2. + <Description><![CDATA[Compared lists differ at index 2. Actual (opA): 'string3' Expected (opB): 'DIFFERS']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[prefix]]></DataTag> - <Description><![CDATA[Compared QStringLists have different sizes. + <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '2' Expected (opB) size: '1']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[short list second]]></DataTag> - <Description><![CDATA[Compared QStringLists have different sizes. + <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '12' Expected (opB) size: '1']]></Description> </Incident> <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308"> <DataTag><![CDATA[short list first]]></DataTag> - <Description><![CDATA[Compared QStringLists have different sizes. + <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: '1' Expected (opB) size: '12']]></Description> </Incident> </TestFunction> +<TestFunction name="compareQListInt"> +<Incident type="fail" file="tst_cmptest.cpp" line="316"> + <Description><![CDATA[Compared lists differ at index 2. + Actual (int1): '3' + Expected (int2): '4']]></Description> +</Incident> +</TestFunction> +<TestFunction name="compareQListDouble"> +<Incident type="fail" file="tst_cmptest.cpp" line="323"> + <Description><![CDATA[Compared lists differ at index 0. + Actual (double1): '1.5' + Expected (double2): '1']]></Description> +</Incident> +</TestFunction> <TestFunction name="compareQPixmaps"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml index 33e78a5290..0cb88147b0 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xunitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.xunitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="0" failures="18" tests="8" name="tst_Cmptest"> +<testsuite errors="0" failures="20" tests="10" name="tst_Cmptest"> <properties> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> @@ -22,22 +22,32 @@ Expected (expected): QVariant(PhonyClass,<value not representable as string>)" result="fail"/> </testcase> <testcase result="fail" name="compareQStringLists"> - <failure tag="last item different" message="Compared QStringLists differ at index 2. + <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 QStringLists differ at index 2. + <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 QStringLists have different sizes. + <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 QStringLists have different sizes. + <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 QStringLists have different sizes. + <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="compareQPixmaps"> <failure tag="one null" message="Compared QPixmaps differ. Actual (opA).isNull(): 1 diff --git a/tests/auto/testlib/selftests/expectfail/expectfail.pro b/tests/auto/testlib/selftests/expectfail/expectfail.pro index fdaf888263..c1849990f2 100644 --- a/tests/auto/testlib/selftests/expectfail/expectfail.pro +++ b/tests/auto/testlib/selftests/expectfail/expectfail.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = expectfail -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/failcleanup/failcleanup.pro b/tests/auto/testlib/selftests/failcleanup/failcleanup.pro index b4781fd062..426d7cc45b 100644 --- a/tests/auto/testlib/selftests/failcleanup/failcleanup.pro +++ b/tests/auto/testlib/selftests/failcleanup/failcleanup.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = failcleanup -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/failinit/failinit.pro b/tests/auto/testlib/selftests/failinit/failinit.pro index 7e926f379f..6a30a5af68 100644 --- a/tests/auto/testlib/selftests/failinit/failinit.pro +++ b/tests/auto/testlib/selftests/failinit/failinit.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = failinit -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro index 312d32605a..b608c67dbb 100644 --- a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro +++ b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = failinitdata -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro index 63b9d223b5..33b306ca75 100644 --- a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro +++ b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = fetchbogus -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro index 25d48376d3..f04a640c59 100644 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro +++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro @@ -7,4 +7,3 @@ CONFIG -= debug_and_release_target RESOURCES = findtestdata.qrc TARGET = findtestdata -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/float/float.pro b/tests/auto/testlib/selftests/float/float.pro index d739abcc06..95980eeac8 100644 --- a/tests/auto/testlib/selftests/float/float.pro +++ b/tests/auto/testlib/selftests/float/float.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = float -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/globaldata/globaldata.pro b/tests/auto/testlib/selftests/globaldata/globaldata.pro index f98ddac02d..c0b1554c0f 100644 --- a/tests/auto/testlib/selftests/globaldata/globaldata.pro +++ b/tests/auto/testlib/selftests/globaldata/globaldata.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = globaldata -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/longstring/longstring.pro b/tests/auto/testlib/selftests/longstring/longstring.pro index d531fe6984..d16ba85095 100644 --- a/tests/auto/testlib/selftests/longstring/longstring.pro +++ b/tests/auto/testlib/selftests/longstring/longstring.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = longstring -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro index ef810bd022..79451af1ec 100644 --- a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro +++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = maxwarnings -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/multiexec/multiexec.pro b/tests/auto/testlib/selftests/multiexec/multiexec.pro index 4638c3c653..2038acbd31 100644 --- a/tests/auto/testlib/selftests/multiexec/multiexec.pro +++ b/tests/auto/testlib/selftests/multiexec/multiexec.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = multiexec -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/printdatatags/printdatatags.pro b/tests/auto/testlib/selftests/printdatatags/printdatatags.pro index 646e55bf8f..cd06384835 100644 --- a/tests/auto/testlib/selftests/printdatatags/printdatatags.pro +++ b/tests/auto/testlib/selftests/printdatatags/printdatatags.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = printdatatags -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro b/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro index bf07434e80..f1cf25d104 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = printdatatagswithglobaltags -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro index 80fb419ac9..bd967f32e6 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro +++ b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = qexecstringlist -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/silent/silent.pro b/tests/auto/testlib/selftests/silent/silent.pro index c4c2e41d6f..3150f65a5e 100644 --- a/tests/auto/testlib/selftests/silent/silent.pro +++ b/tests/auto/testlib/selftests/silent/silent.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = silent -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/singleskip/singleskip.pro b/tests/auto/testlib/selftests/singleskip/singleskip.pro index fed6755dc6..9f63e62747 100644 --- a/tests/auto/testlib/selftests/singleskip/singleskip.pro +++ b/tests/auto/testlib/selftests/singleskip/singleskip.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = singleskip -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/skip/skip.pro b/tests/auto/testlib/selftests/skip/skip.pro index 1bc72da113..8780d295cf 100644 --- a/tests/auto/testlib/selftests/skip/skip.pro +++ b/tests/auto/testlib/selftests/skip/skip.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = skip -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro b/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro index 596166b0b6..f98cda7596 100644 --- a/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro +++ b/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = skipcleanup -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/skipinit/skipinit.pro b/tests/auto/testlib/selftests/skipinit/skipinit.pro index 791782a5c2..7defce9a52 100644 --- a/tests/auto/testlib/selftests/skipinit/skipinit.pro +++ b/tests/auto/testlib/selftests/skipinit/skipinit.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = skipinit -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro index f3f8043b78..cd806c2a43 100644 --- a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro +++ b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = skipinitdata -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/sleep/sleep.pro b/tests/auto/testlib/selftests/sleep/sleep.pro index c3a8dae37d..affcba22ee 100644 --- a/tests/auto/testlib/selftests/sleep/sleep.pro +++ b/tests/auto/testlib/selftests/sleep/sleep.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = sleep -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/strcmp/strcmp.pro b/tests/auto/testlib/selftests/strcmp/strcmp.pro index 498a1ba4f1..f5f6eecc88 100644 --- a/tests/auto/testlib/selftests/strcmp/strcmp.pro +++ b/tests/auto/testlib/selftests/strcmp/strcmp.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = strcmp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/subtest/subtest.pro b/tests/auto/testlib/selftests/subtest/subtest.pro index 6b18f1960a..09dee1b1b9 100644 --- a/tests/auto/testlib/selftests/subtest/subtest.pro +++ b/tests/auto/testlib/selftests/subtest/subtest.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = subtest -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro index 83538edab1..0a31810105 100644 --- a/tests/auto/testlib/selftests/test/test.pro +++ b/tests/auto/testlib/selftests/test/test.pro @@ -18,4 +18,3 @@ RESOURCES += ../selftests.qrc include(../selftests.pri) for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}" -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 4b19ee57ea..441254c126 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -563,6 +563,9 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge && subdir != QLatin1String("cmptest") // QImage comparison requires QGuiApplication && subdir != QLatin1String("fetchbogus") && subdir != QLatin1String("xunit") +#ifdef Q_CC_MINGW + && subdir != QLatin1String("silent") // calls qFatal() +#endif && subdir != QLatin1String("benchlibcallgrind")) QVERIFY2(err.isEmpty(), err.constData()); @@ -570,8 +573,8 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge QString logger = loggers[n]; QList<QByteArray> res = splitLines(actualOutputs[n]); QList<QByteArray> exp = expectedResult(subdir, logger); -#ifdef Q_CC_MSVC - // MSVC formats double numbers differently +#if defined (Q_CC_MSVC) || defined(Q_CC_MINGW) + // MSVC, MinGW format double numbers differently if (n == 0 && subdir == QStringLiteral("float")) { for (int i = 0; i < exp.size(); ++i) { exp[i].replace("e-07", "e-007"); diff --git a/tests/auto/testlib/selftests/verbose1/verbose1.pro b/tests/auto/testlib/selftests/verbose1/verbose1.pro index eae793fc0f..f00ae69d17 100644 --- a/tests/auto/testlib/selftests/verbose1/verbose1.pro +++ b/tests/auto/testlib/selftests/verbose1/verbose1.pro @@ -8,4 +8,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = verbose1 -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/verbose2/verbose2.pro b/tests/auto/testlib/selftests/verbose2/verbose2.pro index 744d51b563..796cdeb975 100644 --- a/tests/auto/testlib/selftests/verbose2/verbose2.pro +++ b/tests/auto/testlib/selftests/verbose2/verbose2.pro @@ -8,4 +8,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = verbose2 -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/warnings/warnings.pro b/tests/auto/testlib/selftests/warnings/warnings.pro index 9ea291606d..0c6cddcefb 100644 --- a/tests/auto/testlib/selftests/warnings/warnings.pro +++ b/tests/auto/testlib/selftests/warnings/warnings.pro @@ -5,4 +5,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = warnings -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/testlib/selftests/xunit/xunit.pro b/tests/auto/testlib/selftests/xunit/xunit.pro index e3a3955735..b8c606e828 100644 --- a/tests/auto/testlib/selftests/xunit/xunit.pro +++ b/tests/auto/testlib/selftests/xunit/xunit.pro @@ -6,4 +6,3 @@ mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target TARGET = xunit -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |