diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp index 86b83ef85a4..3a7c929d305 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp @@ -26,6 +26,7 @@ #include "easingcontextpane.h" #include "ui_easingcontextpane.h" #include +#include #include #include @@ -124,9 +125,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) : m_easingGraph->raise(); setLinear(); - ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png"))); - - + ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon()); setGraphDisplayMode(GraphMode); @@ -228,14 +227,14 @@ void EasingContextPane::startAnimation() m_simulation->stop(); } else { m_simulation->animate(ui->durationSpinBox->value(), m_easingGraph->easingCurve()); - ui->playButton->setIcon(QIcon(QLatin1String(":/stopicon.png"))); + ui->playButton->setIcon(Utils::Icons::STOP_SMALL.icon()); } } void EasingContextPane::switchToGraph() { - ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png"))); + ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon()); setGraphDisplayMode(GraphMode); } diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.qrc b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc index f6e69536806..f90ab25d145 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingpane.qrc +++ b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc @@ -1,7 +1,5 @@ qt_logo.png - playicon.png - stopicon.png diff --git a/src/libs/qmleditorwidgets/easingpane/playicon.png b/src/libs/qmleditorwidgets/easingpane/playicon.png deleted file mode 100644 index ba4f36b5bf5..00000000000 Binary files a/src/libs/qmleditorwidgets/easingpane/playicon.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/easingpane/stopicon.png b/src/libs/qmleditorwidgets/easingpane/stopicon.png deleted file mode 100644 index 74eb2ead324..00000000000 Binary files a/src/libs/qmleditorwidgets/easingpane/stopicon.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/hole.png b/src/libs/qmleditorwidgets/images/hole.png deleted file mode 100644 index b75cca1ea3d..00000000000 Binary files a/src/libs/qmleditorwidgets/images/hole.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/lock.png b/src/libs/qmleditorwidgets/images/lock.png deleted file mode 100644 index 8f1b546c8dc..00000000000 Binary files a/src/libs/qmleditorwidgets/images/lock.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 5c7164c7b8e..5ac07864815 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -4,8 +4,6 @@ images/checkbox_indicator@2x.png images/tr.png images/tr@2x.png - images/lock.png - images/hole.png images/scrollbar-borderimage-horizontal.png images/scrollbar-borderimage-vertical.png images/aspectlockset.png diff --git a/src/plugins/qmldesigner/components/navigator/navigator.qrc b/src/plugins/qmldesigner/components/navigator/navigator.qrc index 41599b77be1..aa28a4aaeec 100644 --- a/src/plugins/qmldesigner/components/navigator/navigator.qrc +++ b/src/plugins/qmldesigner/components/navigator/navigator.qrc @@ -12,6 +12,5 @@ export_checked@2x.png export_unchecked.png export_unchecked@2x.png - warning.png diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 3db86f70091..107e2a9bdb6 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -102,8 +102,10 @@ NavigatorView::NavigatorView(QObject* parent) : Icons::EXPORT_UNCHECKED.pixmap()); #ifdef _LOCK_ITEMS_ - IconCheckboxItemDelegate *lockDelegate = new IconCheckboxItemDelegate(this,":/qmldesigner/images/lock.png", - ":/qmldesigner/images/hole.png",m_treeModel.data()); + IconCheckboxItemDelegate *lockDelegate = + new IconCheckboxItemDelegate(this, + Utils::Icons::LOCKED_TOOLBAR.pixmap(), + Utils::Icons::UNLOCKED_TOOLBAR.pixmap()); #endif diff --git a/src/plugins/qmldesigner/components/navigator/warning.png b/src/plugins/qmldesigner/components/navigator/warning.png deleted file mode 100644 index 38a80acc1ec..00000000000 Binary files a/src/plugins/qmldesigner/components/navigator/warning.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png deleted file mode 100644 index b82f1fd0060..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png deleted file mode 100644 index 4fef115d3ef..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png deleted file mode 100644 index 305530afaf6..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png deleted file mode 100644 index 2dc66ec3e39..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png deleted file mode 100644 index ca297723196..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png deleted file mode 100644 index 7cf55d718d7..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/frame.png b/src/plugins/qmldesigner/components/propertyeditor/images/frame.png deleted file mode 100644 index a9516090188..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/frame.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png b/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png deleted file mode 100644 index ae48afbd7aa..00000000000 Binary files a/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri index 5336225b118..d822fbb70d2 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri @@ -27,5 +27,3 @@ HEADERS += propertyeditorview.h \ qmlmodelnodeproxy.h QT += qml quick - -RESOURCES += propertyeditor.qrc diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc deleted file mode 100644 index 61d22611ba8..00000000000 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc +++ /dev/null @@ -1,12 +0,0 @@ - - - images/button_hovered.png - images/button_normal.png - images/button_pressed.png - images/button2_hovered.png - images/button2_normal.png - images/button2_pressed.png - images/frame.png - images/gradient.png - - diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 80b3dc29249..4fa195b3c57 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -94,8 +94,6 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE m_view(new Quick2PropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()), m_contextObject(new PropertyEditorContextObject()) { - Q_ASSERT(QFileInfo(QLatin1String(":/images/button_normal.png")).exists()); - m_view->engine()->setOutputWarningsToStandardError(QmlDesignerPlugin::instance() ->settings().value(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool()); diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources.qrc index 5b75f585a28..4100b9da6bc 100644 --- a/src/plugins/qmldesigner/components/resources/resources.qrc +++ b/src/plugins/qmldesigner/components/resources/resources.qrc @@ -1,6 +1,5 @@ - templates/Standard/Form.xml stylesheet.css scrollbar.css formeditorstylesheet.css diff --git a/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml b/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml deleted file mode 100644 index 4a9aa660d51..00000000000 --- a/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - Form - - - Hello world - - - -