forked from qt-creator/qt-creator
Use more Utils::isMainThread()
Change-Id: Ia3c6f6dca53c5d7487b0813de16f06c52af47aa5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -3,10 +3,9 @@
|
||||
|
||||
#include "qtcassert.h"
|
||||
#include "singleton.h"
|
||||
#include "threadutils.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QList>
|
||||
#include <QThread>
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -45,7 +44,7 @@ SingletonStaticData &Singleton::staticData(std::type_index index)
|
||||
// only.
|
||||
void Singleton::deleteAll()
|
||||
{
|
||||
QTC_ASSERT(QThread::currentThread() == qApp->thread(), return);
|
||||
QTC_ASSERT(isMainThread(), return);
|
||||
QList<Singleton *> oldList;
|
||||
{
|
||||
QMutexLocker locker(&s_mutex);
|
||||
|
||||
Reference in New Issue
Block a user