Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb

src/plugins/valgrind/callgrindtool.cpp

@@ -937,6 +937,9 @@ void CallgrindTool::createTextMarks()
         bool ok = false;
         const int lineNumber = index.data(DataModel::LineNumberRole).toInt(&ok);
         QTC_ASSERT(ok, continue);
+        // avoid creating invalid text marks
+        if (lineNumber <= 0)
+            continue;
 
         // sanitize filename, text marks need a canonical (i.e. no ".."s) path
         // BaseTextMark::editorOpened(Core::IEditor *editor) compares file names on string basis

src/plugins/valgrind/memcheckerrorview.cpp

@@ -41,6 +41,8 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <utils/qtcassert.h>
+#include <utils/icon.h>
+#include <utils/theme/theme.h>
 
 #include <QAction>
 
@@ -55,7 +57,11 @@ MemcheckErrorView::MemcheckErrorView(QWidget *parent)
 {
     m_suppressAction = new QAction(this);
     m_suppressAction->setText(tr("Suppress Error"));
-    m_suppressAction->setIcon(QIcon(QLatin1String(":/valgrind/images/eye_crossed.png")));
+    const QIcon icon = Utils::Icon({
+            {QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal},
+            {QLatin1String(":/valgrind/images/suppressoverlay.png"), Utils::Theme::IconsErrorColor}},
+            Utils::Icon::Tint | Utils::Icon::PunchEdges).icon();
+    m_suppressAction->setIcon(icon);
     m_suppressAction->setShortcut(QKeySequence(Qt::Key_Delete));
     m_suppressAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     connect(m_suppressAction, &QAction::triggered, this, &MemcheckErrorView::suppressError);

src/plugins/valgrind/valgrind.qrc

@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/valgrind">
-        <file>images/eye_crossed.png</file>
+        <file>images/suppressoverlay.png</file>
+        <file>images/suppressoverlay@2x.png</file>
     </qresource>
 </RCC>