diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
| commit | 2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5 (patch) | |
| tree | e613605a0c295a2af7010e92d7b5d412654bf137 /src/plugins/python/pythonrunconfiguration.cpp | |
| parent | b1415a0ea58e0860c790b1b5ff5fbd3d4bfdd87a (diff) | |
| parent | 02f2a93503a24d2da3b93db2cbfe8463627cf990 (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/plugins/python/pipsupport.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/examplesparser.cpp
tests/auto/examples/tst_examples.cpp
Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
Diffstat (limited to 'src/plugins/python/pythonrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/python/pythonrunconfiguration.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp index dc383961172..552d41128b3 100644 --- a/src/plugins/python/pythonrunconfiguration.cpp +++ b/src/plugins/python/pythonrunconfiguration.cpp @@ -9,6 +9,7 @@ #include "pysideuicextracompiler.h" #include "pythonconstants.h" #include "pythonlanguageclient.h" +#include "pythonplugin.h" #include "pythonproject.h" #include "pythonsettings.h" #include "pythontr.h" @@ -31,6 +32,7 @@ #include <utils/aspects.h> #include <utils/fileutils.h> +#include <utils/futuresynchronizer.h> #include <utils/layoutbuilder.h> #include <utils/outputformatter.h> #include <utils/theme/theme.h> @@ -241,15 +243,12 @@ void PythonRunConfigurationPrivate::checkForPySide(const FilePath &python, { const PipPackage package(pySidePackageName); QObject::disconnect(m_watcherConnection); - m_watcherConnection = QObject::connect(&m_watcher, - &QFutureWatcher<PipPackageInfo>::finished, - q, - [=]() { - handlePySidePackageInfo(m_watcher.result(), - python, - pySidePackageName); - }); - m_watcher.setFuture(Pip::instance(python)->info(package)); + m_watcherConnection = QObject::connect(&m_watcher, &QFutureWatcherBase::finished, q, [=] { + handlePySidePackageInfo(m_watcher.result(), python, pySidePackageName); + }); + const auto future = Pip::instance(python)->info(package); + m_watcher.setFuture(future); + PythonPlugin::futureSynchronizer()->addFuture(future); } void PythonRunConfigurationPrivate::handlePySidePackageInfo(const PipPackageInfo &pySideInfo, |