summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/task.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
commit9f831dde07cb2411808534e76669b28a1b76e21d (patch)
treeed6252d64c9a3ab27aa93786272cda1b6008f3c7 /src/plugins/projectexplorer/task.h
parentcdac81f896ef4b052d76f96485a08e6ec13696b8 (diff)
parentea1a92484ac99057b06130a012164bf9788650e9 (diff)
downloadqt-creator-wip/clang.tar.gz
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'src/plugins/projectexplorer/task.h')
-rw-r--r--src/plugins/projectexplorer/task.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h
index 98782b201d..b387743027 100644
--- a/src/plugins/projectexplorer/task.h
+++ b/src/plugins/projectexplorer/task.h
@@ -54,7 +54,8 @@ public:
Task();
Task(TaskType type, const QString &description,
- const Utils::FileName &file, int line, Core::Id category);
+ const Utils::FileName &file, int line, Core::Id category,
+ const Utils::FileName &iconName = Utils::FileName());
bool isNull() const;
void clear();
@@ -66,6 +67,7 @@ public:
int line;
int movedLine; // contains a line number if the line was moved in the editor
Core::Id category;
+ QIcon icon;
void addMark(TextEditor::BaseTextMark *mark);
// Having a QList<QTextLayout::FormatRange> in Task isn't that great