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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
This commit is contained in:
con
2010-06-10 15:00:16 +02:00
parent 726c3345c4 2de4a98ce0
commit b0040dc858
57 changed files with 423 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/taskwindow.h
View File

@@ -95,8 +95,8 @@ public:
void removeTask(const Task &task);
void clearTasks(const QString &categoryId = QString());
int taskCount(const QString &categoryId = QString()) const;
int errorTaskCount(const QString &categoryId = QString()) const;
int taskCount() const;
int errorTaskCount() const;
// IOutputPane