Merge remote-tracking branch 'origin/4.5'

Change-Id: Iebd340258966aff910fb9ab0e45b5149e8f242f0
2017-10-12 09:49:14 +02:00
parent 845271e957 cd575e3a76
commit 1c1dd45bfe
73 changed files with 3874 additions and 1032 deletions
--- a/src/plugins/vcsbase/submitfieldwidget.cpp
+++ b/src/plugins/vcsbase/submitfieldwidget.cpp
@@ -25,6 +25,8 @@

 #include "submitfieldwidget.h"

+#include <utils/utilsicons.h>
+
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -138,7 +140,7 @@ struct SubmitFieldWidgetPrivate {
 };

 SubmitFieldWidgetPrivate::SubmitFieldWidgetPrivate() :
-        removeFieldIcon(QLatin1String(":/vcsbase/images/removesubmitfield.png")),
+        removeFieldIcon(Utils::Icons::BROKEN.icon()),
        completer(0),
        hasBrowseButton(false),
        allowDuplicateFields(false),