diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-03-14 11:35:07 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-03-14 11:35:07 +0100 |
| commit | c19f97bd231ec3834db27718430d570cbdefa94d (patch) | |
| tree | 6aae0db3fe5634f2255702da6df873dc43013947 /src/plugins/python/pythonutils.cpp | |
| parent | 685f452d91a4a733af5b9f9e3aff4a5e73ee37b2 (diff) | |
| parent | 11752615c5db419bd4bf9842b4f0ba1f8aca8051 (diff) | |
Merge remote-tracking branch 'origin/13.0'
Conflicts:
src/plugins/cmakeprojectmanager/cmaketool.cpp
src/plugins/python/pythonutils.cpp
src/plugins/qtsupport/baseqtversion.cpp
Change-Id: Ia3e35c763ff9475d17ad922718b54152209893b8
Diffstat (limited to 'src/plugins/python/pythonutils.cpp')
| -rw-r--r-- | src/plugins/python/pythonutils.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp index f012bdfd65d..bf97831cad9 100644 --- a/src/plugins/python/pythonutils.cpp +++ b/src/plugins/python/pythonutils.cpp @@ -19,7 +19,6 @@ #include <utils/algorithm.h> #include <utils/mimeutils.h> -#include <utils/persistentcachestore.h> #include <utils/qtcprocess.h> #include <QReadLocker> @@ -201,20 +200,10 @@ static bool isUsableHelper(QHash<FilePath, bool> *cache, const QString &keyStrin auto it = cache->find(python); if (it == cache->end()) { const Key key = keyFromString(keyString); - const auto store = PersistentCacheStore::byKey(key); - if (store && store->value(keyFromString(python.toString())).toBool()) { - cache->insert(python, true); - return true; - } Process process; process.setCommand({python, QStringList{"-m", commandArg, "-h"}}); process.runBlocking(); const bool usable = process.result() == ProcessResult::FinishedWithSuccess; - if (usable) { - Store newStore = store.value_or(Store{}); - newStore.insert(keyFromString(python.toString()), true); - PersistentCacheStore::write(key, newStore); - } it = cache->insert(python, usable); } return *it; |