diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-04-25 17:48:43 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-04-26 08:17:27 +0000 |
commit | 070bfe9387503688e154451c28fe278841012ac4 (patch) | |
tree | dfd0d2c55ab0be3d240819bf8bde5321c45a7287 /src/plugins/android/androiddeployqtstep.cpp | |
parent | 20f1ff22d7892294e0660935d9b29c81039782b6 (diff) |
FutureSynchronizer: Change the default value of cancelOnWait to true
The "false" default wasn't really useful.
This changes the default value to the following usages:
1. AndroidDeployQtStep
Introduced in 91f136ef3ab75471cabcaed9dc16dad9f504add8
The synchronizer was used to cancel the running tasks inside
the doCancel(), so the similar behavior should be expected
when destructing the AndroidDeployQtStep.
2. GitClient
Introduced in f3106ebafe9a02904e822e9698c8b4cbb6c7e0f5
Is used only inside the last line of
GitSubmitEditor::updateFileModel(). The running function
(CommitDataFetchResult::fetch) doesn't take QPromise<>,
so it can't detect if the future was canceled or not.
In this case this change is no-op.
3. ExtraCompiler
Introduced in c99ce1f455189864de9a2043730f704d7b024abf
The intention was to make it cancellable and finish
early on cancel.
4. PluginManager global future synchronizer
Introduced in 72bddf9f51fedd064f551bcb4ced5feeb46fdfc1
The intention was to make it cancellable and finish
early on cancel.
The relevant places in code are marked explicitly for
points: 1, 2 and 3.
Change-Id: I1a52deb8d1f81d355950c8772bbaa6d0a202fd7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/android/androiddeployqtstep.cpp')
-rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 8b2bf8fb09..1fef661569 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -133,6 +133,7 @@ private: Environment m_environment; AndroidDeviceInfo m_deviceInfo; + // The synchronizer has cancelOnWait set to true by default. FutureSynchronizer m_synchronizer; }; |