feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Python: Avoid warning in QFutureWatcher

Browse Source 
Re-using a watcher will trigger the warning as the future had been
set on the "old" watcher even though it may have finished or
disconnected.

Change-Id: I32d937b1d73d8bba9ec5639c62393da84638099e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2023-10-30 10:52:45 +01:00
parent bcc45d8bb9
commit b39476dd47
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/python/pythonrunconfiguration.cpp
View File

@@ -161,7 +161,7 @@ public:
PythonInterpreterAspect *q; PythonInterpreterAspect *q;
RunConfiguration *rc; RunConfiguration *rc;
QList<PySideUicExtraCompiler *> m_extraCompilers; QList<PySideUicExtraCompiler *> m_extraCompilers;
QFutureWatcher<PipPackageInfo> m_watcher; QFutureWatcher<PipPackageInfo> *m_watcher = nullptr;
QMetaObject::Connection m_watcherConnection; QMetaObject::Connection m_watcherConnection;
}; };
@@ -218,11 +218,13 @@ void PythonInterpreterAspectPrivate::checkForPySide(const FilePath &python,
{ {
const PipPackage package(pySidePackageName); const PipPackage package(pySidePackageName);
QObject::disconnect(m_watcherConnection); QObject::disconnect(m_watcherConnection);
m_watcherConnection = QObject::connect(&m_watcher, &QFutureWatcherBase::finished, q, [=] { delete m_watcher;
handlePySidePackageInfo(m_watcher.result(), python, pySidePackageName); m_watcher = new QFutureWatcher<PipPackageInfo>(this);
m_watcherConnection = QObject::connect(m_watcher, &QFutureWatcherBase::finished, q, [=] {
handlePySidePackageInfo(m_watcher->result(), python, pySidePackageName);
}); });
const auto future = Pip::instance(python)->info(package); const auto future = Pip::instance(python)->info(package);
m_watcher.setFuture(future); m_watcher->setFuture(future);
ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future); ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
} }