diff options
Diffstat (limited to 'src/plugins')
74 files changed, 29 insertions, 22 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 3133ba932a..ff01ccd97d 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -69,14 +69,11 @@ QPixmap QmlDesignerIconProvider::getPixmap(const QString &id) else if (id == "plus") result = Utils::Icons::PLUS_TOOLBAR.pixmap(); else if (id == "expression") - result = Icon({ - { iconPath() + QLatin1String("expression.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon(iconPath() + "expression.png").pixmap(); else if (id == "placeholder") - result = Icon({ - { iconPath() + QLatin1String("placeholder.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon(iconPath() + "placeholder.png").pixmap(); else if (id == "submenu") - result = Icon({ - { iconPath() + QLatin1String("submenu.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon(iconPath() + "submenu.png").pixmap(); else if (id == "up-arrow") result = Icon({ { iconPath() + QLatin1String("up-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); diff --git a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png Binary files differindex 1e36a168c7..ef59d89279 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png +++ b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png diff --git a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png Binary files differnew file mode 100644 index 0000000000..6540cc859c --- /dev/null +++ b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc index c9899d2ac5..8e786cae4c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc @@ -1,7 +1,7 @@ <RCC> - <qresource prefix="/ItemLibrary" > + <qresource prefix="/ItemLibrary"> <file>images/item-default-icon.png</file> <file>images/item-invalid-icon.png</file> + <file>images/item-default-icon@2x.png</file> </qresource> </RCC> - diff --git a/src/plugins/qmldesigner/components/navigator/export_checked.png b/src/plugins/qmldesigner/components/navigator/export_checked.png Binary files differindex f0c3b230c0..98e34dd561 100644 --- a/src/plugins/qmldesigner/components/navigator/export_checked.png +++ b/src/plugins/qmldesigner/components/navigator/export_checked.png diff --git a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png Binary files differindex 07f49a8f26..91fb221f04 100644 --- a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png +++ b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked.png b/src/plugins/qmldesigner/components/navigator/export_unchecked.png Binary files differindex 377c97fa8a..32f052838c 100644 --- a/src/plugins/qmldesigner/components/navigator/export_unchecked.png +++ b/src/plugins/qmldesigner/components/navigator/export_unchecked.png diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png Binary files differindex 6a309be703..05abc2ab41 100644 --- a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png +++ b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc index 04b2667776..0ca65a7948 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc @@ -33,6 +33,10 @@ <file>images/splitview-layouts-icon-16px.png</file> <file>images/stack-layouts-icon.png</file> <file>images/stack-layouts-icon-16px.png</file> + <file>images/column-layouts-icon@2x.png</file> + <file>images/grid-layouts-icon@2x.png</file> + <file>images/row-layouts-icon@2x.png</file> + <file>images/stack-layouts-icon@2x.png</file> </qresource> <qresource prefix="/propertyEditorQmlSources/QtQuick"> <file>Controls/ButtonSpecifics.qml</file> diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png Binary files differindex 474df84f6a..9e17cc85bf 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png Binary files differindex 0e2ac31fea..a75ee209d5 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..c70f845e70 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png Binary files differindex 1e9178ff3e..dd6ecb4632 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..3fca41167a --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png Binary files differindex 3a0f5c2186..706194278e 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png Binary files differindex 1082f43b51..df4b60327e 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..ffef790cdc --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png Binary files differindex 3f7ab00c1d..4e7b74aae3 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png +++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png Binary files differindex bbd6783cc5..987ef39507 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..d57cfc2a27 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index 20be7b97f5..9a16ce2b0c 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -38,10 +38,8 @@ const Utils::Icon ARROW_DOWN({ {QLatin1String(":/navigator/icon/arrowdown.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon ARROW_LEFT({ {QLatin1String(":/navigator/icon/arrowleft.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon EXPORT_CHECKED({ - {QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon EXPORT_UNCHECKED({ - {QLatin1String(":/navigator/icon/export_unchecked.png"), Utils::Theme::IconsBaseColor}}); +const Utils::Icon EXPORT_CHECKED(":/navigator/icon/export_checked.png"); +const Utils::Icon EXPORT_UNCHECKED(":/navigator/icon/export_unchecked.png"); const Utils::Icon SNAPPING({ {QLatin1String(":/icon/layout/snapping.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon NO_SNAPPING({ diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png Binary files differindex acd3d477af..5418a0f55a 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png Binary files differindex e8f79c6bf2..17f7ed0688 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png Binary files differnew file mode 100644 index 0000000000..fb4fb33910 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png Binary files differindex b8115abab9..9e17cc85bf 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png Binary files differindex f4ee9fae81..a75ee209d5 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..c70f845e70 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png Binary files differindex 46e3f57183..bdc2253959 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png Binary files differindex 1f83fbbc5b..d7ab9de8a7 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b28b0fa4d9 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png Binary files differindex 67ed96565e..099def3f5b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png Binary files differindex c24a713908..5bb3e91da3 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b2714d34b0 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png Binary files differindex 3f6e38e4e4..0dff9a075d 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png Binary files differindex f2acc88761..50c6f75cd8 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b3ffdea6eb --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png Binary files differindex 8bf1fb2f5a..038a02ed86 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png Binary files differindex c30fec0422..7457fbd7e1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..af233a0df3 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png Binary files differindex 1519fe1eb1..7457fbd7e1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png Binary files differindex c24ecd99e5..038a02ed86 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png Binary files differnew file mode 100644 index 0000000000..af233a0df3 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png Binary files differindex e7a8cff471..318ce0874a 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png Binary files differindex 8bedea8594..3aa46b6106 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png Binary files differnew file mode 100644 index 0000000000..cc84918975 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png Binary files differindex fc53d38ae7..af81cdfdb1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png Binary files differindex 7d2d7a5050..46d3ec1dbc 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png Binary files differnew file mode 100644 index 0000000000..f05aa57c2f --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png Binary files differindex 9c1327373d..5a2f3c203b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png Binary files differindex 1deac24a2a..2657bf2181 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b1d3fb67d2 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png Binary files differindex 9260c8b327..791e5f9520 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png Binary files differindex 4f7bb0cd57..f426957af3 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png Binary files differnew file mode 100644 index 0000000000..14607fb896 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png Binary files differindex 32bb26c059..8dc82b8196 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png Binary files differindex b9b9da253b..a6a61f61b2 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png Binary files differnew file mode 100644 index 0000000000..d654a8e7e6 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png Binary files differindex 4a092f1519..3997195f72 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png Binary files differindex e00eb9aef9..72893106ae 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png Binary files differnew file mode 100644 index 0000000000..150fa50ea2 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png Binary files differindex 42c03d6e2c..1113e8148b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png Binary files differindex f908c3d0d8..df4b60327e 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..ffef790cdc --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png Binary files differindex 53f10d6c9e..068ebeef0f 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png Binary files differindex da30741772..b96ed468cb 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png Binary files differnew file mode 100644 index 0000000000..3b7cb6d5da --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png Binary files differindex 9c90cc4403..29a81f5d6c 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png Binary files differindex b744ef0eea..ee7cc512cb 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png Binary files differnew file mode 100644 index 0000000000..1df8f765de --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png Binary files differindex a605c16ba4..c743c22074 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png Binary files differindex 5a565d8b28..3ceef6d037 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png Binary files differnew file mode 100644 index 0000000000..666644d2d3 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc index 39121e2340..5b146ece1c 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc @@ -52,5 +52,22 @@ <file>images/grid-positioner-icon-16px.png</file> <file>images/row-positioner-icon.png</file> <file>images/row-positioner-icon-16px.png</file> + <file>images/border-image-icon@2x.png</file> + <file>images/column-positioner-icon@2x.png</file> + <file>images/flickable-icon@2x.png</file> + <file>images/flow-positioner-icon@2x.png</file> + <file>images/focusscope-icon@2x.png</file> + <file>images/grid-positioner-icon@2x.png</file> + <file>images/gridview-icon@2x.png</file> + <file>images/image-icon@2x.png</file> + <file>images/item-icon@2x.png</file> + <file>images/listview-icon@2x.png</file> + <file>images/mouse-area-icon@2x.png</file> + <file>images/pathview-icon@2x.png</file> + <file>images/rect-icon@2x.png</file> + <file>images/row-positioner-icon@2x.png</file> + <file>images/text-edit-icon@2x.png</file> + <file>images/text-icon@2x.png</file> + <file>images/text-input-icon@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo index 0ae6693541..5ecfda7cef 100644 --- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo +++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo @@ -163,16 +163,7 @@ MetaInfo { ItemLibraryEntry { name: "List View" category: "Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/pathview-icon.png" - version: "1.1" - - QmlSource { source: ":/qtquickplugin/source/listview.qml" } - } - - ItemLibraryEntry { - name: "List View" - category: "Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/pathview-icon.png" + libraryIcon: ":/qtquickplugin/images/listview-icon.png" version: "2.0" QmlSource { source: ":/qtquickplugin/source/listviewv2.qml" } |
