tst_QTimer: suppress the cross-thread timer stopping warnings
Both QTimer's and QObjectPrivate's destructors print a warning if the current object lives on another thread and has an active timer: QWARN : tst_QTimer::moveToThread() QObject::killTimer: Timers cannot be stopped from another thread QWARN : tst_QTimer::moveToThread() QObject::~QObject: Timers cannot be stopped from another thread This timer is used to ask the thread to quit, which in turn allows us to destroy this QObject without a cross-thread warning. Because it's already fired once and done its duty, we can make sure it's not active by simply making it single-shot. Pick-to: 6.4 6.5 Change-Id: Ieec322d73c1e40ad95c8fffd17465067b27c044b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
parent
b528e44f5a
commit
5f32c9edce
@ -512,6 +512,7 @@ void tst_QTimer::moveToThread()
|
||||
#endif
|
||||
QTimer ti1;
|
||||
QTimer ti2;
|
||||
ti1.setSingleShot(true);
|
||||
ti1.start(MOVETOTHREAD_TIMEOUT);
|
||||
ti2.start(MOVETOTHREAD_TIMEOUT);
|
||||
QVERIFY((ti1.timerId() & 0xffffff) != (ti2.timerId() & 0xffffff));
|
||||
|
Loading…
Reference in New Issue
Block a user