diff options
| author | con <qtc-committer@nokia.com> | 2010-07-16 11:50:01 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-16 11:50:01 +0200 |
| commit | eef08b12e3cdb1ce1546c51566a7b1bfe59c7129 (patch) | |
| tree | 9307fe31f61da9c276032e29e9bca3c122f3568f /src/plugins/projectexplorer/taskwindow.h | |
| parent | 41236d29d328950d9240d4e3a5e2c98d3214b65b (diff) | |
| parent | 2b3db20507006b2953c74dde778a3feb25ffb3bf (diff) | |
| download | qt-creator-eef08b12e3cdb1ce1546c51566a7b1bfe59c7129.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/projectexplorer/compileoutputwindow.cpp
src/plugins/projectexplorer/compileoutputwindow.h
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/projectexplorer/outputwindow.h
Diffstat (limited to 'src/plugins/projectexplorer/taskwindow.h')
| -rw-r--r-- | src/plugins/projectexplorer/taskwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index d5a0f410c0..872f562b08 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -78,6 +78,7 @@ public: signals: void tasksChanged(); + void tasksCleared(); private slots: void addCategory(const QString &categoryId, const QString &displayName); |