whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_ASSERT's from QObject autotest 

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
(cherry picked from commit 0c157af3e5aa7c56c53b9eabe1510cc639610969)
bb10
Jason McDonald 2011-05-09 13:16:39 +10:00 committed by Rohan McGovern
parent 9e31e99a13
commit 1799546675
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/tst_qobject.cpp
View File

@ -1330,14 +1330,16 @@ public:
void customEvent(QEvent *)
{
Q_ASSERT(customEventThread == 0);
if (customEventThread)
qFatal("%s: customEventThread should be null", Q_FUNC_INFO);
customEventThread = QThread::currentThread();
emit theSignal();
}
void timerEvent(QTimerEvent *)
{
Q_ASSERT(timerEventThread == 0);
if (timerEventThread)
qFatal("%s: timerEventThread should be null", Q_FUNC_INFO);
timerEventThread = QThread::currentThread();
emit theSignal();
}
@ -1345,7 +1347,8 @@ public:
public slots:
void theSlot()
{
Q_ASSERT(slotThread == 0);
if (slotThread)
qFatal("%s: slotThread should be null", Q_FUNC_INFO);
slotThread = QThread::currentThread();
emit theSignal();
}