summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-17189-8502/+1636
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-05-17103-978/+1100
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits) Fixed license header. Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile Remove Q_ASSERT's from qsharedmemory autotest Remove Q_ASSERT's from QNetworkReply autotest Remove Q_ASSERT's from qabstractxmlnodemodel test Remove Q_ASSERT from QXmlStream autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from QItemModel autotest Remove Q_ASSERT's from qxmlquery autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qscriptvaluegenerated test Remove Q_ASSERT from QVariant autotest Remove Q_ASSERT's from QTreeView autotest Remove Q_ASSERT from qtesselator autotest Remove unused function from qtessellator autotest Remove Q_ASSERT from qscriptvaluegenerated test Remove Q_ASSERT's from qscriptvaluegenerated test ...
| | * Merge remote branch 'origin/4.8' into qa-review-masterRohan McGovern2011-05-152772-115383/+272395
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qaccessibility/tst_qaccessibility.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-136-4/+79
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fixed license header. Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
| | | * | Fixed license header.Rohan McGovern2011-05-131-0/+42
| | | | |
| | | * | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-126-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make. This would break in the case where the correct makefile was not named `Makefile'. The included autotest demonstrates the problem. Note that this was fixed for normal targets back in 2005 by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not fixed for extra targets. Reviewed-by: ossi
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-122-2/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from qsharedmemory autotest
| | | * | Remove Q_ASSERT's from qsharedmemory autotestJason McDonald2011-05-112-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a fatal error rather than ignoring the error in non-debug builds. Change-Id: Ib6ef993e6e0c65bd9adea994ea7b454cc147f3d4 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-101-7/+11
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from QNetworkReply autotest
| | | * | Remove Q_ASSERT's from QNetworkReply autotestJason McDonald2011-05-101-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing mysteriously in release builds, report fatal errors in all builds. Change-Id: I020b06e19b7ffc8ae4413e1756259f4ca608f253 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-108-34/+54
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from qabstractxmlnodemodel test Remove Q_ASSERT from QXmlStream autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from QItemModel autotest Remove Q_ASSERT's from qxmlquery autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from qabstractxmlnodemodel test
| | | * | Remove Q_ASSERT's from qabstractxmlnodemodel testJason McDonald2011-05-101-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report fatal errors rather than ignoring the errors in non-debug builds. Change-Id: I5d2f20113cbca11e272cf8fc2591e38b94d6853b Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from QXmlStream autotestJason McDonald2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a meaningful fatal error if an unknown token type is encountered rather than ignoring the error in non-debug builds and reporting an uninformative message in debug builds. Change-Id: Id219f3c7cbd4ba3e9875cb81f833720d5d153132 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qxmlquery autotestJason McDonald2011-05-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report fatal error in all builds not just debug builds. Change-Id: I6c64435d0382a160ac3602e5243fad9d9585f057 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-101-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report fatal errors rather than ignoring them in non-debug builds. Change-Id: I62dd177e2f391e64c12314bf224f8952ed6f3144 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from QItemModel autotestJason McDonald2011-05-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If populateTestData() would return an invalid model index, report a meaningful fatal error rather than failing silently in a release build and aborting with an uninformative error message in a debug build. Change-Id: I96820429a25ce5c4eb375d50e7e1f672851e26e6 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from qxmlquery autotestJason McDonald2011-05-102-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make url validity check part of the regular test logic rather than aborting in debug builds and ignoring the error in release builds. Change-Id: Ic00610c04ee596f519b9d461748b401719cf41c0 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qxmlquery autotestJason McDonald2011-05-102-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make stream validity check part of the regular test logic rather than aborting in debug builds and ignoring the error in release builds. Change-Id: I07dcba079eecd88bf16672c6019a8d6f5a829fee Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-101-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report fatal errors rather than ignoring them in non-debug builds. Change-Id: Ieafc58f3603fa953f4a963394039e613dcd442fb Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If new "axis" enum values are added in the future, the test should report a meaningful warning in the test output rather than aborting with a meaningless message in debug builds and failing silently in release builds. Change-Id: Ifdc7a9492c3ee196d7f0e6958eec34693efd244f Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-102-12/+16
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT from qscriptvaluegenerated test Remove Q_ASSERT from QVariant autotest
| | | * | Remove Q_ASSERT from qscriptvaluegenerated testJason McDonald2011-05-101-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a fatal error if an unknown type of comparison is requested rather than failing silently in non-debug builds. Also fixes the misspelled parameter name. Change-Id: I84bd018aa99e99a98d97c43343032b38ca9cbccb Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from QVariant autotestJason McDonald2011-05-101-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed one Q_ASSERT in the previous commit. Also changing to use Q_FUNC_INFO instead of hard-coded function names in the warning messages. Change-Id: I0ff5b2b2cda02597836beb5d2811fa8dd2a344ab Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-099-38/+70
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from QTreeView autotest Remove Q_ASSERT from qtesselator autotest Remove unused function from qtessellator autotest Remove Q_ASSERT from qscriptvaluegenerated test Remove Q_ASSERT's from qscriptvaluegenerated test Remove Q_ASSERT's from V8 autotest Remove Q_ASSERT from qscriptengine autotest Remove Q_ASSERT's from qreadwritelock autotest Remove Q_ASSERT's from QObject autotest Remove Q_ASSERT's from QObject autotest
| | | * | Remove Q_ASSERT's from QTreeView autotestJason McDonald2011-05-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report fatal errors instead of failing silently in non-debug builds. Change-Id: Ieaff30b71dba2a385a5fffc93d2a8c0f5864aa18 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qtesselator autotestJason McDonald2011-05-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a fatal error rather than failing silently in non-debug builds. Change-Id: I625c5aa6f86a5764cd8f078baa074d6475a67736 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove unused function from qtessellator autotestJason McDonald2011-05-091-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24c1db8392370d19970421a014f7bb6c4bc7c6e8 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qscriptvaluegenerated testJason McDonald2011-05-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a fatal error if an empty test is generated rather than failing silently in non-debug builds. Change-Id: I79aa7a9eb09e387cef1960816a4bcce7b1af282d Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from qscriptvaluegenerated testJason McDonald2011-05-091-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a fatal error if there are problems reading from the input data stream rather than failing silently in non-debug builds. Change-Id: I7a913bf47dccb37bab09e1cd79e5022b04e42c27 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from V8 autotestJason McDonald2011-05-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a fatal error when the realFail() function is missing or misbehaving rather than silently ignoring the failure in non-debug builds. Change-Id: I8b27aeb1c9dab5752a5dbedafc4d420bb4121d2b Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qscriptengine autotestJason McDonald2011-05-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing silently in release builds, output a meaningful warning message and return a null QScriptValue which will cause the "isQObject" check in the testfunction to fail. Change-Id: I69fd9c15a69924d0abfde6710ea6ae4bf7e013fa Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from qreadwritelock autotestJason McDonald2011-05-091-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tryWriteLock testfunction didn't do anything useful in non-debug builds, due to the thread having the important code inside Q_ASSERT's, which are no-ops in non-debug builds. This commit removes the Q_ASSERT's, counts the number of failures in the thread and fails the test if there are any failures recorded. Change-Id: I4750f66eeba22ab51ba348ebc06704052421f1ae Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from QObject autotestJason McDonald2011-05-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing silently in release builds, report a fatal error in all builds if the helper class methods are called more than once. Change-Id: Id1fda8dc7caf008bbc8f6ae6384abee1aa8f50eb Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from QObject autotestJason McDonald2011-05-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing silently in release builds, report a meaningful fatal error in all builds. Change-Id: I3b874f187d482e9785a839cab1a3855b631404c3 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-092-9/+29
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from QNetworkReply autotest Remove Q_ASSERT from qitemmodel autotest
| | | * | Remove Q_ASSERT's from QNetworkReply autotestJason McDonald2011-05-091-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and ignoring the failure in release builds, report a fatal error in all builds. Change-Id: I1fb8e692c65cf23cf5d2453173db742260ddca48 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qitemmodel autotestJason McDonald2011-05-091-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform actions needed for the test inside Q_ASSERT, because these actions won't happen in a non-debug build. Change-Id: I0758e9f29f38c1a83a1501357286877f05beb6c8 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-067-30/+92
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from QMutex autotest Remove Q_ASSERT from QMetaType autotest Remove Q_ASSERT's in qitemview autotest Remove Q_ASSERT from qitemmodel autotest Remove Q_ASSERT from algorithms autotest Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT's from qabstractfileengine test
| | | * | Remove Q_ASSERT's from QMutex autotestJason McDonald2011-05-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform actions needed for the test inside Q_ASSERT, because these actions won't happen in a non-debug build. Instead count the number of failures and verify that the count is zero at the end of the test. Change-Id: Ibe0d194111e5247118d59a7760f0946d2c44faf9 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from QMetaType autotestJason McDonald2011-05-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace Q_ASSERT in helper class with code to count failures and report meaningful warnings. The test function then fails the test if any failures were recorded. Change-Id: I0d6650e6036c8e45729c16d1dbb7543b4fb42553 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's in qitemview autotestJason McDonald2011-05-061-12/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing silently in release builds, report a meaningful warning message and return an appropriate value to indicate the error. Change-Id: I0ceb0a0bfaef34cc6127d768cc75ecfc5a24e3c9 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qitemmodel autotestJason McDonald2011-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If populateTestData() is passed an unknown type of model, report a meaningful fatal error rather than failing silently in a release build and aborting with an uninformative error message in a debug build. Change-Id: I7ee8d1262bbced304f9f24c2ec9b40a38704d982 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from algorithms autotestJason McDonald2011-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a meaningful warning message rather than aborting in a debug build and failing silently in a release build. Change-Id: Ic77589143ff0d22c95c7b10f2e511f68b3da4d86 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of aborting in debug builds and failing silently in release builds, print a meaningful warning message into the test output and return a null QVariant. Change-Id: Idcd70f5cb01528b522d84e391f6f8692a189f420 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in a debug build and failing silently in a release build, report a warning and return a null model index if the first (root) node of the model is not a document. The null return value will cause initTestCase() to fail gracefully. Change-Id: I15e9456929bbb3f0bd50d30333c49143b6f0aad7 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of aborting in a debug build and failing silently in a release build when the internal state of the model is incorrect, report a meaningful fatal error in all builds. Change-Id: I64ca4dde070cb7fbe69684a36092d53e5b84d80a Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT from qabstractxmlnodemodel testJason McDonald2011-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructing a model index from a null pointer will cause the test to crash later. Instead of crashing this way in a release build and aborting in a debug build, report the fatal error in all builds. Change-Id: I43ce4c8fa48caa05aaf09ac3c1453d35a2de65bf Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | | * | Remove Q_ASSERT's from qabstractfileengine testJason McDonald2011-05-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing silently in release builds, report a meaningful warning message and skip setting the filename, which should cause a subsequent test failure. Change-Id: I3ae4f4de7b02bf2194019047fa87d8ae06d95634 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-05-064-15/+56
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Remove Q_ASSERT's from modeltest Remove Q_ASSERT from modeltest Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT's from modeltest
| | | * | Remove Q_ASSERT's from modeltestJason McDonald2011-05-061-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and ignoring the failures in release builds, report specific warnings on each failure, count the failures, and fail the test if the failure counts are non-zero at the end of the test. The same change is also made for a QCOMPARE that appeared inappropriately inside a helper class. QCOMPARE may only appear directly in a test function. Change-Id: I81f0ce80512fa72c67f5aa72c0511a4b650d5d20 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern