Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 1 insertions, 14 deletions

diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index 1cc702050b..0a45e0f090 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -117,7 +117,7 @@ void TaskHub::addTask(Task task)
     if (task.line != -1 && !task.file.isEmpty()) {
         bool visible = (task.type == Task::Warning || task.type == Task::Error);
         TaskMark *mark = new TaskMark(task.taskId, task.file.toString(), task.line, visible);
-        mark->setIcon(taskTypeIcon(task.type));
+        mark->setIcon(task.icon);
         mark->setPriority(TextEditor::ITextMark::LowPriority);
         task.addMark(mark);
         emit m_instance->taskAdded(task);
@@ -167,16 +167,3 @@ void TaskHub::requestPopup()
     emit m_instance->popupRequested(Core::IOutputPane::NoModeSwitch);
 }
 
-QIcon TaskHub::taskTypeIcon(Task::TaskType t)
-{
-    switch (t) {
-    case Task::Warning:
-        return m_instance->m_warningIcon;
-    case Task::Error:
-        return m_instance->m_errorIcon;
-    case Task::Unknown:
-        break;
-    }
-    return QIcon();
-}
-