diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-04-03 11:54:31 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-04-07 16:49:51 +0000 |
| commit | e883650ed56be014933245a2f4e71b4008000912 (patch) | |
| tree | d4ac113cfed08872354e601fef26a774e02613ad /src/plugins/projectexplorer/extracompiler.h | |
| parent | f589e8b38d11b6b891447c32db3dac8a5031948a (diff) | |
ProjectExplorer: Gracefully abort process upon ExtraCompiler delete
Task-number: QTCREATORBUG-15993
Change-Id: I9d3bf92a6c2e41bb40a01a1a613f6b98f72cf6be
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer/extracompiler.h')
| -rw-r--r-- | src/plugins/projectexplorer/extracompiler.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h index 024c9b8758..21efd6b29f 100644 --- a/src/plugins/projectexplorer/extracompiler.h +++ b/src/plugins/projectexplorer/extracompiler.h @@ -101,6 +101,7 @@ public: ProcessExtraCompiler(const Project *project, const Utils::FileName &source, const Utils::FileNameList &targets, QObject *parent = nullptr); + ~ProcessExtraCompiler(); protected: // This will run a process in a thread, if @@ -128,9 +129,10 @@ protected: private: using ContentProvider = std::function<QByteArray()>; void runImpl(const ContentProvider &sourceContents); - FileNameToContentsHash runInThread(const Utils::FileName &cmd, const Utils::FileName &workDir, - const QStringList &args, const ContentProvider &provider, - const Utils::Environment &env); + void runInThread(QFutureInterface<FileNameToContentsHash> &futureInterface, + const Utils::FileName &cmd, const Utils::FileName &workDir, + const QStringList &args, const ContentProvider &provider, + const Utils::Environment &env); void cleanUp(); QFutureWatcher<FileNameToContentsHash> *m_watcher = nullptr; |