feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Merge QtcProcess and SynchronousProcess

Browse Source 
Keep SynchronousProcess as type alias for a transition period.

Change-Id: I2540b6cecc17eb46f40ed57d27589011693728f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-06-22 04:24:13 +02:00
parent cfabd8483b
commit 953ea730b8
4 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -184,7 +184,7 @@ bool CMakeTool::isValid() const
return m_introspection->m_didRun && !m_introspection->m_fileApis.isEmpty();
}
void CMakeTool::runCMake(SynchronousProcess &cmake, const QStringList &args, int timeoutS) const
void CMakeTool::runCMake(QtcProcess &cmake, const QStringList &args, int timeoutS) const
{
cmake.setTimeoutS(timeoutS);
cmake.setDisableUnixTerminal();

4
src/plugins/cmakeprojectmanager/cmaketool.h
View File

@@ -33,7 +33,7 @@
#include <utils/id.h>
#include <utils/optional.h>
namespace Utils { class SynchronousProcess; }
namespace Utils { class QtcProcess; }
namespace CMakeProjectManager {
@@ -112,7 +112,7 @@ public:
private:
void readInformation() const;
void runCMake(Utils::SynchronousProcess &proc, const QStringList &args, int timeoutS = 1) const;
void runCMake(Utils::QtcProcess &proc, const QStringList &args, int timeoutS = 1) const;
void parseFunctionDetailsOutput(const QString &output);
QStringList parseVariableOutput(const QString &output);