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

Merge integration refs/builds/qtci/dev/1616760368

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-26 15:17:07 +00:00
commit ebf9b3d096
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/kernel/qtimerinfo_unix.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Copyright (C) 2016 Intel Corporation. ** Copyright (C) 2016 Intel Corporation.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
@ -631,13 +631,16 @@ int QTimerInfoList::activateTimers()
if (currentTimerInfo->interval > 0) if (currentTimerInfo->interval > 0)
n_act++; n_act++;
// Send event, but don't allow it to recurse:
if (!currentTimerInfo->activateRef) { if (!currentTimerInfo->activateRef) {
// send event, but don't allow it to recurse
currentTimerInfo->activateRef = &currentTimerInfo; currentTimerInfo->activateRef = &currentTimerInfo;
QTimerEvent e(currentTimerInfo->id); QTimerEvent e(currentTimerInfo->id);
QCoreApplication::sendEvent(currentTimerInfo->obj, &e); QCoreApplication::sendEvent(currentTimerInfo->obj, &e);
// Storing currentTimerInfo's address in its activateRef allows the
// handling of that event to clear this local variable on deletion
// of the object it points to - if it didn't, clear activateRef:
if (currentTimerInfo) if (currentTimerInfo)
currentTimerInfo->activateRef = nullptr; currentTimerInfo->activateRef = nullptr;
} }