From 68115440f03af2462ad9991eaa37cad7aa25ef55 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 2 Nov 2016 18:06:37 +0100 Subject: [PATCH] Utils: Move the breakpoint icon mask from Debugger to Utils A filled circle can be used for other icons as-well. Change-Id: Ifed0dda111ccb92fa5bb44d63f1c23af1137121a Reviewed-by: Leena Miettinen Reviewed-by: Alessandro Portale --- .../utils/images/filledcircle.png} | Bin .../utils/images/filledcircle@2x.png} | Bin src/libs/utils/utils.qrc | 2 ++ src/plugins/debugger/debugger.qrc | 2 -- src/plugins/debugger/debuggericons.cpp | 4 ++-- src/tools/icons/qtcreatoricons.svg | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename src/{plugins/debugger/images/breakpoint.png => libs/utils/images/filledcircle.png} (100%) rename src/{plugins/debugger/images/breakpoint@2x.png => libs/utils/images/filledcircle@2x.png} (100%) diff --git a/src/plugins/debugger/images/breakpoint.png b/src/libs/utils/images/filledcircle.png similarity index 100% rename from src/plugins/debugger/images/breakpoint.png rename to src/libs/utils/images/filledcircle.png diff --git a/src/plugins/debugger/images/breakpoint@2x.png b/src/libs/utils/images/filledcircle@2x.png similarity index 100% rename from src/plugins/debugger/images/breakpoint@2x.png rename to src/libs/utils/images/filledcircle@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 9c6e7c6a08a..eff85a3d455 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -168,5 +168,7 @@ images/fittoview@2x.png images/namespace.png images/namespace@2x.png + images/filledcircle.png + images/filledcircle@2x.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index f49e25cd7bf..301234efaed 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -25,8 +25,6 @@ images/debugger_stepout_small@2x.png images/debugger_stepover_small.png images/debugger_stepover_small@2x.png - images/breakpoint.png - images/breakpoint@2x.png images/breakpoint_disabled.png images/breakpoint_disabled@2x.png images/breakpoint_pending_overlay.png diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index e16fd5cd0f4..3fc7fd50b99 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -31,11 +31,11 @@ namespace Debugger { namespace Icons { const Icon BREAKPOINT({ - {":/debugger/images/breakpoint.png", Theme::IconsErrorColor}}, Icon::Tint); + {":/utils/images/filledcircle.png", Theme::IconsErrorColor}}, Icon::Tint); const Icon BREAKPOINT_DISABLED({ {":/debugger/images/breakpoint_disabled.png", Theme::IconsErrorColor}}, Icon::Tint); const Icon BREAKPOINT_PENDING({ - {":/debugger/images/breakpoint.png", Theme::IconsErrorColor}, + {":/utils/images/filledcircle.png", Theme::IconsErrorColor}, {":/debugger/images/breakpoint_pending_overlay.png", Theme::PanelTextColorDark}}, Icon::IconStyleOptions(Icon::Tint | Icon::PunchEdges)); const Icon BREAKPOINTS( ":/debugger/images/debugger_breakpoints.png"); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index ea755809a84..ba571ca2888 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5128,7 +5128,7 @@ sodipodi:nodetypes="cccccccc" />