diff options
| author | Eike Ziller <[email protected]> | 2021-09-17 10:29:36 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2021-09-17 09:10:50 +0000 |
| commit | 118883f66a7039506b788a8df4f5606017e45242 (patch) | |
| tree | ca4bf67d48eb081799e5b875fe0ec485501d54d8 /src/plugins/qmakeprojectmanager/qmakeparsernodes.h | |
| parent | 9aa3a20c16ccd879273f9baa3c4f4ad4e2855a6e (diff) | |
qmake: Fix crash with Qt 6 when canceling parsing
In Qt 5, QFutureWatcher::isFinished was only true if the finished signal
was already sent. That changed in Qt 6, where it represents the state of
the QFuture instead. Use an explicit bool for representing "finished
signal was sent" instead.
Task-number: QTCREATORBUG-24098
Change-Id: I4dd8e1c7f6659b2856634d522fb1c0f7eef6741b
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeparsernodes.h')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparsernodes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index 836c04e5890..9d1121c2fb0 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h @@ -352,7 +352,7 @@ private: void setParseInProgress(bool b); void setValidParseRecursive(bool b); - void applyAsyncEvaluate(); + void applyAsyncEvaluate(bool apply); void setupReader(); Internal::QmakeEvalInput evalInput() const; |