AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_ASSERT's from QObject autotest

Browse Source 
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
(cherry picked from commit 844906474dd6905d36003143a03a2fbccf0ad0dd)
This commit is contained in:
Jason McDonald 2011-05-09 13:01:40 +10:00 committed by Rohan McGovern
parent f6cbfff326
commit 9e31e99a13
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/qobject/signalbug.cpp
View File

@ -69,7 +69,8 @@ void Receiver::received ()
::Step++;
const int stepCopy = ::Step;
TRACE (stepCopy, "Receiver::received()");
Q_ASSERT (::Step == 2 || ::Step == 4);
if (::Step != 2 && ::Step != 4)
qFatal("%s: Incorrect Step: %d (should be 2 or 4)", Q_FUNC_INFO, ::Step);
if (::Step == 2)
s->fire ();
@ -91,7 +92,8 @@ void Disconnector::received ()
::Step++;
const int stepCopy = ::Step;
TRACE (stepCopy, "Disconnector::received()");
Q_ASSERT (::Step == 5 || ::Step == 6);
if (::Step != 5 && ::Step != 6)
qFatal("%s: Incorrect Step: %d (should be 5 or 6)", Q_FUNC_INFO, ::Step);
fprintf (stderr, "Disconnector<%s>::received() sender=%s\n",
(const char *) objectName ().toAscii (), sender ()->metaObject()->className());
@ -124,7 +126,8 @@ void Sender::fire ()
::Step++;
const int stepCopy = ::Step;
TRACE (stepCopy, "Sender::fire()");
Q_ASSERT (::Step == 1 || ::Step == 3);
if (::Step != 1 && ::Step != 3)
qFatal("%s: Incorrect Step: %d (should be 1 or 3)", Q_FUNC_INFO, ::Step);
emit fired ();
TRACE (stepCopy, "ends Sender::fire()");