diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-19 17:01:08 +0100 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-11-21 22:18:35 +0200 |
| commit | 4e6142c93226862458252da84a5ce0539e6008ae (patch) | |
| tree | a75c38085df5769e21e11c3b6c5b0b774434c9f2 /src/plugins/cmakeprojectmanager/cmaketool.h | |
| parent | fd8afd564f847f24ad119fd519929de6dcb94139 (diff) | |
| parent | e53e0a808b5d0075c95fd7635ce53cc4de277f3a (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/autotest/testresultspane.cpp
src/plugins/cmakeprojectmanager/cmaketool.cpp
Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmaketool.h')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmaketool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h index 1e305b2dd3..fd2c087c20 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.h +++ b/src/plugins/cmakeprojectmanager/cmaketool.h @@ -126,7 +126,7 @@ private: }; void readInformation(QueryType type) const; - Utils::SynchronousProcessResponse run(const QStringList &args, bool mayFail = false) const; + Utils::SynchronousProcessResponse run(const QStringList &args, int timeoutS = 1) const; void parseFunctionDetailsOutput(const QString &output); QStringList parseVariableOutput(const QString &output); |