diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-03 16:10:04 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-03 16:10:04 +0100 |
| commit | f4e87a7e0cbc62738bc00733a3655486c9a26959 (patch) | |
| tree | 768e41482b57f0b37813b4b5b888c8aae51b230e /src/plugins/projectexplorer/applicationlauncher.h | |
| parent | 0aeb654685c24c528dd482c799cad8e008c130ef (diff) | |
| parent | fc5768212021f7fb9f5af2389b1bdeefed5ca4a6 (diff) | |
Merge remote-tracking branch 'origin/3.6' into 4.0
Conflicts:
src/plugins/projectexplorer/applicationlauncher.cpp
src/plugins/projectexplorer/applicationlauncher.h
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
src/plugins/qmlprofiler/qmlprofilertool.cpp
src/plugins/qtsupport/uicodemodelsupport.cpp
src/plugins/qtsupport/uicodemodelsupport.h
Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57
Diffstat (limited to 'src/plugins/projectexplorer/applicationlauncher.h')
| -rw-r--r-- | src/plugins/projectexplorer/applicationlauncher.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index 06820b7f6c..ae62cb857d 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -69,6 +69,7 @@ signals: void error(QProcess::ProcessError error); private: + void handleProcessStarted(); void guiProcessError(); void consoleProcessError(const QString &error); void readStandardOutput(); |