diff --git a/src/libs/utils/filterlineedit.cpp b/src/libs/utils/filterlineedit.cpp index 41cb7e1ba46..d02c9a6f244 100644 --- a/src/libs/utils/filterlineedit.cpp +++ b/src/libs/utils/filterlineedit.cpp @@ -36,7 +36,7 @@ FilterLineEdit::FilterLineEdit(QWidget *parent) : m_lastFilterText(text()) { setSide(Utils::FancyLineEdit::Right); - setPixmap(QPixmap(QLatin1String(":/utils/images/reset.png"))); + setPixmap(QPixmap(QLatin1String(":/core/images/reset.png"))); setPlaceholderText(tr("Type to filter")); connect(this, SIGNAL(buttonClicked()), this, SLOT(clear())); diff --git a/src/libs/utils/images/reset.png b/src/libs/utils/images/reset.png deleted file mode 100644 index cc0d6a26bd5..00000000000 Binary files a/src/libs/utils/images/reset.png and /dev/null differ diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 8d4efc94be7..d284ce40d5d 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -1,6 +1,5 @@ - + images/removesubmitfield.png - images/reset.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index cb606618ee0..31b8174e7d6 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -50,8 +50,8 @@ images/category_project.png images/category_design.png images/category_qt.png - editormanager/BinFiles.mimetypes.xml images/progressbar.png + images/help.png diff --git a/src/plugins/coreplugin/fancyactionbar.qrc b/src/plugins/coreplugin/fancyactionbar.qrc index 7f0a8eab280..c06c43e476d 100644 --- a/src/plugins/coreplugin/fancyactionbar.qrc +++ b/src/plugins/coreplugin/fancyactionbar.qrc @@ -5,9 +5,6 @@ images/mode_Output.png images/mode_Project.png images/mode_Reference.png - images/fancytoolbutton_bottom_outline.png - images/fancytoolbutton_normal_outline.png - images/fancytoolbutton_top_outline.png images/mode_Design.png diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index c708be98693..2026598f0c9 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -180,6 +180,10 @@ ? + + + :/core/images/help.png:/core/images/help.png + @@ -211,6 +215,10 @@ ? + + + :/core/images/help.png:/core/images/help.png + diff --git a/src/plugins/coreplugin/images/button_top_outline.png b/src/plugins/coreplugin/images/button_top_outline.png deleted file mode 100644 index edb50687ce3..00000000000 Binary files a/src/plugins/coreplugin/images/button_top_outline.png and /dev/null differ diff --git a/src/plugins/coreplugin/images/clear.png b/src/plugins/coreplugin/images/clear.png index 72279e1c694..cbb0e2e651d 100644 Binary files a/src/plugins/coreplugin/images/clear.png and b/src/plugins/coreplugin/images/clear.png differ diff --git a/src/plugins/coreplugin/images/fancytoolbutton_bottom_outline.png b/src/plugins/coreplugin/images/fancytoolbutton_bottom_outline.png deleted file mode 100644 index 6cb32d87e3e..00000000000 Binary files a/src/plugins/coreplugin/images/fancytoolbutton_bottom_outline.png and /dev/null differ diff --git a/src/plugins/coreplugin/images/fancytoolbutton_normal_outline.png b/src/plugins/coreplugin/images/fancytoolbutton_normal_outline.png deleted file mode 100644 index 8e7958e99da..00000000000 Binary files a/src/plugins/coreplugin/images/fancytoolbutton_normal_outline.png and /dev/null differ diff --git a/src/plugins/coreplugin/images/fancytoolbutton_top_outline.png b/src/plugins/coreplugin/images/fancytoolbutton_top_outline.png deleted file mode 100644 index 55e0f2a08f0..00000000000 Binary files a/src/plugins/coreplugin/images/fancytoolbutton_top_outline.png and /dev/null differ diff --git a/src/plugins/coreplugin/images/help.png b/src/plugins/coreplugin/images/help.png new file mode 100644 index 00000000000..a12ef281d47 Binary files /dev/null and b/src/plugins/coreplugin/images/help.png differ diff --git a/src/plugins/coreplugin/images/reset.png b/src/plugins/coreplugin/images/reset.png index cc0d6a26bd5..08aa5ee75c2 100644 Binary files a/src/plugins/coreplugin/images/reset.png and b/src/plugins/coreplugin/images/reset.png differ diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp index 579860bae49..50a1c5d5169 100644 --- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp +++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp @@ -88,7 +88,6 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug m_lineEdit->setToolTip(tr("Write and evaluate QtScript expressions.")); m_clearButton = new QToolButton(); - m_clearButton->setIcon(QIcon(QLatin1String(":/utils/images/reset.png"))); m_clearButton->setToolTip(tr("Clear Output")); m_clearButton->setIcon(QIcon(Core::Constants::ICON_CLEAN_PANE)); connect(m_clearButton, SIGNAL(clicked()), this, SLOT(clearTextEditor()));