diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-02 12:37:49 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-02 12:27:54 +0000 |
commit | 018ba5a8341eb23f7e376f816229c0ac73d85f18 (patch) | |
tree | b90df80e0f941d4cc4d85c983b81547217d8e05b /src/plugins/git/gitsubmiteditorwidget.cpp | |
parent | 3ed12811e0e5a9958f90e5ccff3691629154a10f (diff) | |
download | qt-creator-018ba5a8341eb23f7e376f816229c0ac73d85f18.tar.gz |
Rename the "ERROR" icon to "CRITICAL"
We mostly use this icon in terms of showing messages which might be
informational, warnings, or errors. We cannot call the icon "ERROR" as
that clashes with some macro on windows. To be more inline with Qt's
predefined messaging macros (qDebug(), qInfo(), qWarning(),
qCritical(), qFatal()), we rename the icon to "CRITICAL" and regroup
the entries in the header to suggest this usage.
Change-Id: I89880919d7ca54ea9c86de384eb29f375bf3075f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/git/gitsubmiteditorwidget.cpp')
-rw-r--r-- | src/plugins/git/gitsubmiteditorwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 7a5d4d49b3..66e0b80b8d 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -52,7 +52,7 @@ GitSubmitEditorWidget::GitSubmitEditorWidget() : new GitSubmitHighlighter(descriptionEdit()); m_emailValidator = new QRegExpValidator(QRegExp("[^@ ]+@[^@ ]+\\.[a-zA-Z]+"), this); - const QPixmap error = Utils::Icons::ERROR.pixmap(); + const QPixmap error = Utils::Icons::CRITICAL.pixmap(); m_gitSubmitPanelUi.invalidAuthorLabel->setPixmap(error); m_gitSubmitPanelUi.invalidEmailLabel->setToolTip(tr("Provide a valid email to commit.")); m_gitSubmitPanelUi.invalidEmailLabel->setPixmap(error); |