diff --git a/src/libs/utils/filterlineedit.cpp b/src/libs/utils/filterlineedit.cpp index 41cb7e1ba4645a3707898df074202d597500ae1c..d02c9a6f2444f8016eb4580b66dd76bfb7f05566 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 cc0d6a26bd58dfcea87d02c7fc1415557ad47fd1..0000000000000000000000000000000000000000 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 8d4efc94be75499b9ccf962e332e5fee1945ac35..d284ce40d5d74e5fd12f75bf2ab64731004e0fed 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -1,6 +1,5 @@ <RCC> - <qresource prefix="/utils" > + <qresource prefix="/utils"> <file>images/removesubmitfield.png</file> - <file>images/reset.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index cb606618ee0ce23f6992dd41134fca2deac53696..31b8174e7d6471bd4b1fb04610a71df0cd51a8d9 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -50,8 +50,8 @@ <file>images/category_project.png</file> <file>images/category_design.png</file> <file>images/category_qt.png</file> - <file>editormanager/BinFiles.mimetypes.xml</file> <file>images/progressbar.png</file> + <file>images/help.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/fancyactionbar.qrc b/src/plugins/coreplugin/fancyactionbar.qrc index 7f0a8eab2801f3947a2669d510142b6798bdb5e4..c06c43e476dccfcba30d73ad25d98180aba23729 100644 --- a/src/plugins/coreplugin/fancyactionbar.qrc +++ b/src/plugins/coreplugin/fancyactionbar.qrc @@ -5,9 +5,6 @@ <file>images/mode_Output.png</file> <file>images/mode_Project.png</file> <file>images/mode_Reference.png</file> - <file>images/fancytoolbutton_bottom_outline.png</file> - <file>images/fancytoolbutton_normal_outline.png</file> - <file>images/fancytoolbutton_top_outline.png</file> <file>images/mode_Design.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index c708be9869327b6fe2b5414a98cdcc6f00fef585..2026598f0c9153f4a0ebaad98270ba29b8aaa4a0 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -180,6 +180,10 @@ <property name="text"> <string>?</string> </property> + <property name="icon"> + <iconset resource="core.qrc"> + <normaloff>:/core/images/help.png</normaloff>:/core/images/help.png</iconset> + </property> </widget> </item> <item row="2" column="0"> @@ -211,6 +215,10 @@ <property name="text"> <string>?</string> </property> + <property name="icon"> + <iconset resource="core.qrc"> + <normaloff>:/core/images/help.png</normaloff>:/core/images/help.png</iconset> + </property> </widget> </item> <item row="3" column="0" colspan="4"> 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 edb50687ce30f063d513ec9548ba1d253bdb655e..0000000000000000000000000000000000000000 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 72279e1c6941ee22c6f4dac76ea6266b71b72304..cbb0e2e651d4ac23841ac3237c478fd8e3dcda4f 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 6cb32d87e3ef84253f4c924e4d8b59610f096b9b..0000000000000000000000000000000000000000 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 8e7958e99da79934d90aad9e2b3ba077a6c6ce7e..0000000000000000000000000000000000000000 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 55e0f2a08f01a57dfdc91abc86296c0a8288f981..0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..a12ef281d473f676801118d053fd0ae7506a737a 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 cc0d6a26bd58dfcea87d02c7fc1415557ad47fd1..08aa5ee75c2174d4a91ed4bc4880e86ffaa57b53 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 579860bae49ba44864837db65613968ab3be8c4c..50a1c5d51699d1f9695afb145c79ffff26e04a16 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()));