From ab74d238487c0935856c65fce751190deac56af4 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 5 Mar 2010 14:30:08 +0100
Subject: [PATCH] Avoid pulling in the svg plugin.
---
src/plugins/bookmarks/bookmarksplugin.cpp | 1 -
src/plugins/coreplugin/fancyactionbar.qrc | 1 -
.../coreplugin/images/fancytoolbutton.svg | 539 ------------------
src/plugins/cppeditor/cppeditor.qrc | 4 +-
src/plugins/cppeditor/cpphoverhandler.cpp | 2 +-
src/plugins/cppeditor/images/f1.png | Bin 0 -> 677 bytes
src/plugins/debugger/breakhandler.cpp | 6 +-
src/plugins/debugger/debugger.qrc | 15 +-
src/plugins/debugger/debuggermanager.cpp | 2 +-
src/plugins/debugger/images/breakpoint_16.png | Bin 0 -> 765 bytes
src/plugins/debugger/images/breakpoint_24.png | Bin 0 -> 1159 bytes
.../images/breakpoint_disabled_16.png | Bin 0 -> 741 bytes
.../images/breakpoint_disabled_24.png | Bin 0 -> 1200 bytes
.../images/breakpoint_disabled_32.png | Bin 0 -> 1622 bytes
.../debugger/images/breakpoint_pending_16.png | Bin 0 -> 872 bytes
.../debugger/images/breakpoint_pending_24.png | Bin 0 -> 1366 bytes
src/plugins/debugger/images/empty.svg | 67 ---
src/plugins/debugger/images/empty14.png | Bin 0 -> 172 bytes
src/plugins/debugger/images/location_16.png | Bin 0 -> 580 bytes
src/plugins/debugger/images/location_24.png | Bin 0 -> 794 bytes
src/plugins/debugger/snapshothandler.cpp | 4 +-
src/plugins/debugger/stackhandler.cpp | 8 +-
src/plugins/qmljseditor/qmljshoverhandler.cpp | 2 +-
23 files changed, 24 insertions(+), 627 deletions(-)
delete mode 100644 src/plugins/coreplugin/images/fancytoolbutton.svg
create mode 100644 src/plugins/cppeditor/images/f1.png
create mode 100644 src/plugins/debugger/images/breakpoint_16.png
create mode 100644 src/plugins/debugger/images/breakpoint_24.png
create mode 100644 src/plugins/debugger/images/breakpoint_disabled_16.png
create mode 100644 src/plugins/debugger/images/breakpoint_disabled_24.png
create mode 100644 src/plugins/debugger/images/breakpoint_disabled_32.png
create mode 100644 src/plugins/debugger/images/breakpoint_pending_16.png
create mode 100644 src/plugins/debugger/images/breakpoint_pending_24.png
delete mode 100644 src/plugins/debugger/images/empty.svg
create mode 100644 src/plugins/debugger/images/empty14.png
create mode 100644 src/plugins/debugger/images/location_16.png
create mode 100644 src/plugins/debugger/images/location_24.png
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index db1bc653181..2fab511ecb8 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -146,7 +146,6 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
m_bookmarkMarginAction = new QAction(this);
m_bookmarkMarginAction->setText(tr("Toggle Bookmark"));
- //m_bookmarkAction->setIcon(QIcon(":/gdbdebugger/images/breakpoint.svg"));
connect(m_bookmarkMarginAction, SIGNAL(triggered()),
this, SLOT(bookmarkMarginActionTriggered()));
diff --git a/src/plugins/coreplugin/fancyactionbar.qrc b/src/plugins/coreplugin/fancyactionbar.qrc
index 8867bc59afb..7f0a8eab280 100644
--- a/src/plugins/coreplugin/fancyactionbar.qrc
+++ b/src/plugins/coreplugin/fancyactionbar.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/fancyactionbar">
- <file>images/fancytoolbutton.svg</file>
<file>images/mode_Debug.png</file>
<file>images/mode_Edit.png</file>
<file>images/mode_Output.png</file>
diff --git a/src/plugins/coreplugin/images/fancytoolbutton.svg b/src/plugins/coreplugin/images/fancytoolbutton.svg
deleted file mode 100644
index 8c9c0f1d623..00000000000
--- a/src/plugins/coreplugin/images/fancytoolbutton.svg
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64"
- height="64"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docname="fancytoolbutton.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="C:\depot\ide\research\modes\src\plugins\coreplugin\images"
- style="display:inline">
- <defs
- id="defs4">
- <linearGradient
- id="linearGradient3213">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.21969697;"
- offset="0"
- id="stop3215" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.0530303;"
- offset="1"
- id="stop3217" />
- </linearGradient>
- <linearGradient
- id="linearGradient3227">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.13559322;"
- offset="0"
- id="stop3229" />
- <stop
- style="stop-color:#3a3a3a;stop-opacity:0.11016949;"
- offset="1"
- id="stop3231" />
- </linearGradient>
- <linearGradient
- id="linearGradient3284">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.62931037;"
- offset="0"
- id="stop3286" />
- <stop
- style="stop-color:#a3a3a3;stop-opacity:0;"
- offset="1"
- id="stop3288" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective62" />
- <linearGradient
- id="linearGradient3299">
- <stop
- id="stop3301"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:0.31384614;" />
- <stop
- id="stop3303"
- offset="1"
- style="stop-color:#ffffff;stop-opacity:0.15686275;" />
- </linearGradient>
- <linearGradient
- id="linearGradient3293">
- <stop
- id="stop3295"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:1;" />
- <stop
- id="stop3297"
- offset="1"
- style="stop-color:#000000;stop-opacity:0.02157165;" />
- </linearGradient>
- <linearGradient
- id="linearGradient3218">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.78431374;"
- offset="0"
- id="stop3220" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3222" />
- </linearGradient>
- <linearGradient
- id="linearGradient3204">
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="0"
- id="stop3206" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.25098041;"
- offset="1"
- id="stop3208" />
- </linearGradient>
- <linearGradient
- id="linearGradient3162">
- <stop
- style="stop-color:#424242;stop-opacity:0.13793103;"
- offset="0"
- id="stop3164" />
- <stop
- style="stop-color:#f0f0f0;stop-opacity:0;"
- offset="1"
- id="stop3166" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3204"
- id="linearGradient3210"
- x1="32"
- y1="32"
- x2="32"
- y2="61"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="linearGradient3224"
- x1="24"
- y1="1.9999999"
- x2="24"
- y2="31.571428"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3162"
- id="linearGradient3267"
- gradientUnits="userSpaceOnUse"
- x1="32"
- y1="64"
- x2="32"
- y2="0" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="linearGradient3271"
- gradientUnits="userSpaceOnUse"
- x1="24"
- y1="1.9999999"
- x2="24"
- y2="31.571428" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3299"
- id="radialGradient3283"
- cx="32"
- cy="32"
- fx="32"
- fy="32"
- r="29"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3213"
- id="radialGradient2210"
- gradientUnits="userSpaceOnUse"
- cx="32"
- cy="32"
- fx="32"
- fy="32"
- r="29"
- gradientTransform="matrix(0.962963,0,0,0.9444445,1.1851851,1.7777776)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient4673"
- cx="24"
- cy="-2.0519459"
- fx="24"
- fy="-2.0519459"
- r="18"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.8095239,-6.9383612e-8,5.1646454e-8,1.8333332,-19.428571,1.7619038)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient4675"
- cx="24"
- cy="-0.72727227"
- fx="24"
- fy="-0.72727227"
- r="18"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.8095238,0,0,1.8333332,-19.42857,-1.6666668)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3227"
- id="radialGradient3233"
- cx="48.656292"
- cy="51.519093"
- fx="48.656292"
- fy="51.519093"
- r="29.444443"
- gradientUnits="userSpaceOnUse" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#3e5e7e"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="1"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6568542"
- inkscape:cx="-11.541044"
- inkscape:cy="27.695432"
- inkscape:document-units="px"
- inkscape:current-layer="LayerPressed"
- showgrid="true"
- inkscape:window-width="1551"
- inkscape:window-height="972"
- inkscape:window-x="103"
- inkscape:window-y="25"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:grid-points="true"
- inkscape:snap-nodes="true"
- inkscape:snap-global="false"
- inkscape:snap-intersection-grid-guide="false">
- <inkscape:grid
- type="xygrid"
- id="grid2388"
- spacingx="0.5px"
- spacingy="0.5px"
- empspacing="4"
- dotted="false"
- enabled="true"
- visible="false" />
- <sodipodi:guide
- orientation="1,0"
- position="32,44.910714"
- id="guide3214" />
- <sodipodi:guide
- orientation="horizontal"
- position="32.880465,29.521708"
- id="guide2214" />
- <inkscape:grid
- id="GridFromPre046Settings"
- type="xygrid"
- originx="0px"
- originy="0px"
- spacingx="1px"
- spacingy="1px"
- color="#0000ff"
- empcolor="#0000ff"
- opacity="0.2"
- empopacity="0.4"
- empspacing="1"
- visible="true"
- enabled="false" />
- <sodipodi:guide
- orientation="0,1"
- position="45.749998,96.999996"
- id="guide4677" />
- <sodipodi:guide
- orientation="1,0"
- position="69.999997,64.124997"
- id="guide4679" />
- <sodipodi:guide
- orientation="0,1"
- position="14.437499,62"
- id="guide4681" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- <dc:date />
- <dc:creator>
- <cc:Agent>
- <dc:title />
- </cc:Agent>
- </dc:creator>
- <dc:rights>
- <cc:Agent>
- <dc:title />
- </cc:Agent>
- </dc:rights>
- <dc:publisher>
- <cc:Agent>
- <dc:title />
- </cc:Agent>
- </dc:publisher>
- <dc:identifier />
- <dc:source />
- <dc:relation />
- <dc:language />
- <dc:subject>
- <rdf:Bag />
- </dc:subject>
- <dc:coverage />
- <dc:description />
- <dc:contributor>
- <cc:Agent>
- <dc:title />
- </cc:Agent>
- </dc:contributor>
- <cc:license
- rdf:resource="" />
- </cc:Work>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:groupmode="layer"
- id="LayerBase"
- inkscape:label="LayerBase"
- style="display:none">
- <g
- style="fill:none;stroke:url(#radialGradient3233);stroke-width:2.17741656;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
- id="ButtonBase"
- transform="matrix(0.6792453,0,0,0.6792453,10.26415,10.26415)">
- <path
- d="M 61.444443,32 A 29.444443,29.444443 0 1 1 60.441148,24.379217"
- sodipodi:ry="29.444443"
- sodipodi:rx="29.444443"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path3257"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3233);stroke-width:2.17741656;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc"
- sodipodi:start="0"
- sodipodi:end="6.0213859"
- sodipodi:open="true" />
- <path
- transform="matrix(0.9498207,0,0,0.9498207,1.6057361,1.6057361)"
- d="M 63,32 A 31,31 0 1 1 1,32 A 31,31 0 1 1 63,32 z"
- sodipodi:ry="31"
- sodipodi:rx="31"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path3259"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3233);stroke-width:2.7574501;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="matrix(0.9,0,0,0.9,3.1999999,3.1999999)"
- d="M 62,32 A 30,30 0 1 1 2,32 A 30,30 0 1 1 62,32 z"
- sodipodi:ry="30"
- sodipodi:rx="30"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path3281"
- style="opacity:1;fill:none;fill-opacity:0.62672813;fill-rule:evenodd;stroke:#2b2b2b;stroke-width:1.92861104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50228307"
- sodipodi:type="arc" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="LayerPressed"
- inkscape:label="LayerPressed"
- style="display:inline">
- <g
- id="ButtonPressedBase"
- transform="matrix(0.6792453,0,0,0.6792453,10.26415,10.26415)">
- <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect4724"
- width="64"
- height="64"
- x="0"
- y="0" />
- <path
- transform="matrix(0.9310345,0,0,0.9310345,2.2068967,2.2068968)"
- d="M 61,32 A 29,29 0 1 1 3,32 A 29,29 0 1 1 61,32 z"
- sodipodi:ry="29"
- sodipodi:rx="29"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path3263"
- style="opacity:1;fill:url(#radialGradient2210);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.10000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="matrix(1.4166666,0,0,1.4027778,-1.9999995,3.1944446)"
- d="M 42,20 A 18,18 0 1 1 6,20 A 18,18 0 1 1 42,20 z"
- sodipodi:ry="18"
- sodipodi:rx="18"
- sodipodi:cy="20"
- sodipodi:cx="24"
- id="path3209"
- style="opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- sodipodi:type="arc" />
- </g>
- <g
- id="ButtonPressedOverlay"
- transform="matrix(0.6792453,0,0,0.6792453,10.26415,12.739024)"
- style="opacity:0.56682028">
- <rect
- y="0"
- x="0"
- height="64"
- width="64"
- id="rect3182"
- style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- sodipodi:type="arc"
- style="opacity:0.47465436999999999;fill:url(#radialGradient4675);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.10000000000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="path3226"
- sodipodi:cx="24"
- sodipodi:cy="20"
- sodipodi:rx="18"
- sodipodi:ry="18"
- d="M 42,20 A 18,18 0 1 1 6,20 A 18,18 0 1 1 42,20 z"
- transform="matrix(1.1666668,0,0,1,3.9999975,4.9999993)" />
- </g>
- </g>
- <g
- inkscape:label="LayerNormal"
- inkscape:groupmode="layer"
- id="LayerNormal"
- style="display:none">
- <g
- style="display:inline"
- id="ButtonNormalBase"
- transform="matrix(0.6792453,0,0,0.7011564,10.26415,10.26415)">
- <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect4730"
- width="64"
- height="64"
- x="0"
- y="0"
- ry="0" />
- <path
- transform="matrix(1.4722222,0,0,1.4444445,-3.3333336,2.1111101)"
- d="M 42,20 A 18,18 0 1 1 6,20 A 18,18 0 1 1 42,20 z"
- sodipodi:ry="18"
- sodipodi:rx="18"
- sodipodi:cy="20"
- sodipodi:cx="24"
- id="path4734"
- style="opacity:1;fill:#ffffff;fill-opacity:0.1254902;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- sodipodi:type="arc" />
- </g>
- <g
- id="ButtonNormalOverlay"
- style="display:inline"
- transform="matrix(0.6792453,0,0,0.6792453,10.528302,9.6981123)">
- <rect
- ry="0"
- y="0"
- x="0"
- height="64"
- width="64"
- id="rect2202"
- style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient4673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path3188"
- sodipodi:cx="24"
- sodipodi:cy="20"
- sodipodi:rx="18"
- sodipodi:ry="18"
- d="M 42,20 A 18,18 0 1 1 6,20 A 18,18 0 1 1 42,20 z"
- transform="matrix(1.1666667,0,0,1.0000001,3.9999997,3.9999987)" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="LayerDisabled"
- inkscape:label="LayerDisabled"
- style="display:none">
- <g
- id="ButtonDisabledOverlay"
- transform="matrix(0.6792453,0,0,0.6792453,10.26415,10.26415)">
- <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect2247"
- width="64"
- height="64"
- x="0"
- y="0"
- ry="0" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:#808080;fill-opacity:0.17351595;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path2250"
- sodipodi:cx="32"
- sodipodi:cy="32"
- sodipodi:rx="30"
- sodipodi:ry="30"
- d="M 62,32 A 30,30 0 1 1 2,32 A 30,30 0 1 1 62,32 z"
- transform="matrix(0.9,0,0,0.9,3.2,3.2)" />
- </g>
- </g>
- <g
- inkscape:groupmode="layer"
- id="LayerButtonHover"
- inkscape:label="LayerButtonHover"
- style="display:none">
- <g
- id="ButtonHoverOverlay"
- transform="matrix(0.6792453,0,0,0.6792453,10.26415,10.26415)">
- <rect
- ry="0"
- y="0"
- x="0"
- height="64"
- width="64"
- id="rect2209"
- style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- transform="matrix(0.9,0,0,0.9,3.2,3.2)"
- d="M 62,32 A 30,30 0 1 1 2,32 A 30,30 0 1 1 62,32 z"
- sodipodi:ry="30"
- sodipodi:rx="30"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path2211"
- style="opacity:1;fill:#ffffff;fill-opacity:0.04020099;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </g>
-</svg>
diff --git a/src/plugins/cppeditor/cppeditor.qrc b/src/plugins/cppeditor/cppeditor.qrc
index b136d7f97fd..61cf4a08a65 100644
--- a/src/plugins/cppeditor/cppeditor.qrc
+++ b/src/plugins/cppeditor/cppeditor.qrc
@@ -1,9 +1,9 @@
<RCC>
- <qresource prefix="/cppeditor" >
- <file>images/f1.svg</file>
+ <qresource prefix="/cppeditor">
<file>images/qt_cpp.png</file>
<file>images/qt_h.png</file>
<file>CppEditor.mimetypes.xml</file>
<file>images/qt_c.png</file>
+ <file>images/f1.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 5f89aa436b5..84ed79a986e 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -405,7 +405,7 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
if (!m_helpId.isEmpty() && !m_helpEngine->linksForIdentifier(m_helpId).isEmpty()) {
if (showF1) {
m_toolTip = QString(QLatin1String("<table><tr><td valign=middle><nobr>%1</td>"
- "<td><img src=\":/cppeditor/images/f1.svg\"></td></tr></table>"))
+ "<td><img src=\":/cppeditor/images/f1.png\"></td></tr></table>"))
.arg(m_toolTip);
}
editor->setContextHelpId(m_helpId);
diff --git a/src/plugins/cppeditor/images/f1.png b/src/plugins/cppeditor/images/f1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f3dd0be93cbc45ab9305b44dcdd4f9026c1de35
GIT binary patch
literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z4HE{BTWJ3P00JdRL_t(I%birQZW=)leX}>WXDQ|+OEeTvSZ??L#6S24=p3cDQbkEa
zPvc)eMyXvQe!!IUj{F4>`DDdl1LAfj#j)qZKolrOn!TBQ_ukyQp}}AfiO5a4T)wi_
z#;OVtfvV==&ms!dVxHBUOJ5d?#m_Jdzp;qi)a&(YYwfz|AR-&#oX_2da~?5scs-j<
z9hb}H&(>O~DuN&Y5fy+OhzQ06a4v;NRto~nd(t$;e7*tz1Ob0xYi&tHz|2UJqyS<-
zM0swEK@bF6&s7!U@fdG!a}ZI?o{2GLFWA3w|1!_m6o>8`8jS{8trl9X7KXzihzO65
zk7&2sJAqXJ=Q0fT$f}w*)@n7}-QDGv`u#q7y&lfb&v&vclG<WOM0kFFMz`C=Xf%Q`
z29-($olXY;cFHHh8e@;-Fbq+xR&jQA1|mYU*#tB1ouw+)mQt{)=K6hOsZ_${<>eLt
zfIX7m$HpQV!=jvvi;JyGCnqPU)oMFgdQt#D_xD3RJ^h3@j<H&;4zi5TA0B>TJf46E
zFrKc690it*;=@<=Gdu<?lZ@gFH+^^vOYfAmWZg3Mp)50%ZqwMSRl4zi{x6tw4zI7T
zxl=ez(`gt=DM=Ej3Yf#4JMn#)7Hbak`2tT*iC6f-%jNQxIs6I$lgaNxmTC^3?NWm%
zvbW64-)FO_VGgeVjf?9&vs9L6#s`cc5Sctz1(<_BQDl2j6#e)ME5{6vm<Q&p00000
LNkvXXu0mjf1sNnI
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index e0960a4d6a8..c1459cf8735 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -286,9 +286,9 @@ bool BreakpointData::conditionsMatch() const
BreakHandler::BreakHandler(DebuggerManager *manager, QObject *parent) :
QAbstractTableModel(parent),
- m_breakpointIcon(QLatin1String(":/debugger/images/breakpoint.svg")),
- m_disabledBreakpointIcon(QLatin1String(":/debugger/images/breakpoint_disabled.svg")),
- m_pendingBreakPointIcon(QLatin1String(":/debugger/images/breakpoint_pending.svg")),
+ m_breakpointIcon(QLatin1String(":/debugger/images/breakpoint_16.png")),
+ m_disabledBreakpointIcon(QLatin1String(":/debugger/images/breakpoint_disabled_16.png")),
+ m_pendingBreakPointIcon(QLatin1String(":/debugger/images/breakpoint_pending_16.png")),
m_manager(manager)
{
}
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index debe6ace90e..d63be1ecc2d 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -1,8 +1,5 @@
<RCC>
<qresource prefix="/debugger">
- <file>images/breakpoint.svg</file>
- <file>images/breakpoint_pending.svg</file>
- <file>images/breakpoint_disabled.svg</file>
<file>images/debugger_breakpoints.png</file>
<file>images/debugger_continue_small.png</file>
<file>images/debugger_interrupt_small.png</file>
@@ -17,14 +14,22 @@
<file>images/debugger_stop_small.png</file>
<file>images/delete.png</file>
<file>images/done.png</file>
- <file>images/empty.svg</file>
<file>images/error.png</file>
- <file>images/location.svg</file>
<file>images/newitem.png</file>
<file>images/running.png</file>
<file>images/debugger_continue.png</file>
<file>images/debugger_interrupt.png</file>
<file>images/debugger_stop.png</file>
<file>images/SingleInstructionMode.png</file>
+ <file>images/breakpoint_16.png</file>
+ <file>images/breakpoint_24.png</file>
+ <file>images/breakpoint_disabled_16.png</file>
+ <file>images/breakpoint_disabled_24.png</file>
+ <file>images/breakpoint_disabled_32.png</file>
+ <file>images/breakpoint_pending_16.png</file>
+ <file>images/breakpoint_pending_24.png</file>
+ <file>images/empty14.png</file>
+ <file>images/location_16.png</file>
+ <file>images/location_24.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 8b77f107933..7f0ead327a8 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -312,7 +312,7 @@ DebuggerManager *DebuggerManagerPrivate::instance = 0;
DebuggerManagerPrivate::DebuggerManagerPrivate(DebuggerManager *manager) :
m_stopIcon(QLatin1String(":/debugger/images/debugger_stop_small.png")),
m_interruptIcon(QLatin1String(":/debugger/images/debugger_interrupt_small.png")),
- m_locationMarkIcon(QLatin1String(":/debugger/images/location.svg")),
+ m_locationMarkIcon(QLatin1String(":/debugger/images/location_16.png")),
m_startParameters(new DebuggerStartParameters),
m_inferiorPid(0),
m_disassemblerViewAgent(manager),
diff --git a/src/plugins/debugger/images/breakpoint_16.png b/src/plugins/debugger/images/breakpoint_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..3881602a9507027d562067cfecae6f990150d6db
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3<^3r_SaVc00MnUL_t(I%dL}3YZOrsg}-~dC-WZ3C?>&O5F>~}AQ*`t<`;-NgF82h
zuKXv0D1sok62YwtaS>FE5y1zFF(eq07={@Qv8SKY-S?J@))2v^2Mz@n?xE_OD#aem
zgIj}()yc^#<?-?3rFOfTce}x0Wo0p1TDo}>9xD+3g*PzqX?l8d`{BbpU0;`MbF<*a
zh78u$q<iO%`Ec~;+m~=~?>_~w0Eg>Gj=UScb*nzqY$~({r3#9G2x2Wsr(?ffzWmMh
zdMBp918@XXN9*~qxw%8tu`w-i%r2t{2}2|ZkbWO+j55Aoi<XxU-xYZT;4Z@XA=e$R
zIF2^mF1lQXQVCqQ=)hXYb0o`<!GLC?QTi@&ZUK(Zz(?0{oU4tIkw(6{ir%*mX*5uk
z3OEi*YvhkW9AkYS+1jE$JglSb?MuLQ7i*`=trn7|<SQ%a(NR>Zg|1W($ALV@4hG21
z4tb}8h)`~|hN7LFGgymjMH-Ilg4Rf$V|^cO47OH7RjY*$QG^Xcl(mS~IHeK-!vI<-
z<(V`sX8q0GwxbBibHo@hrg*m&lcu0l4?qLY6VH=fqml&D6#FNII7ZSGNmIx&B+H0B
zFA-y&0B9p}!|(NC8^=hJ6lMhh5{B3?EMg49LM%zhgMirc#K1iOJp<1~<i(HW<wT;W
z$lUj_{XXJ(MfLqcFbL=^EyW6MpN93lo7i@gdS7Wa4<4A9D7*D~u?Jcgo@5zWzfbSW
zmn2V;w+)fmW039&0KA6%N~s6H*;>0T<yLFRDU~p3O8oQZAo4sHrS8YpUYmvFuUpuQ
vS1_&Mg4X(sg|<?vE5<wp9-M;D{BQgMVoH@-WdxBp00000NkvXXu0mjfCIM3S
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/breakpoint_24.png b/src/plugins/debugger/images/breakpoint_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..c232ad1ffcfcc0409e6f78c96cb421735812923a
GIT binary patch
literal 1159
zcmV;21bF+2P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3=0*AJljtI00aj~L_t(Y$IX??j}%oD#($??Gi7&_o?*f;kQp-xD>o1b?IZEQ#>he?
zQAu1GBO4&-!nk2U;=+Z*o%{>N7-bR`=#EG-0fqR;h=BzOgXvBW!I|!+>FTPwb&rec
z>c^1rvGXJ+x9+WbzVDuM&pB7vLT*6t0A2xJbHnf%XKHGf<NJZx*l3tmYX!LA!1*ft
z$$ybc;9Y_Dep*<#_s8ke+FoAP^!|M{tyZqhrgm3Wv~lj7{#LEVSK;i>ux%?m8J%2*
z?U~5eGslj-u;ch~ymA@GbwOm@N)@%1%ov&%FH$>mreWLdR}aFqEeS5eOaRL}PM+K|
zbMz>F7=q&r!HZFKII5DxF%MQ&xO?hUoW}9X&%*bk1YQxA0KS@7T--Bt=n!rcVdEGa
z2NB7^N4>BXRRwDiRZ4SnJaPDNu)ehP%`)tN4pzqqCgC06#mc^YcyWw1CI@$2)N#f=
z>7N{HA<Ix}ku0OKcdx83Els;{7I<qwa07x4eC&9hEpOZA*k%(v4?GWX-F)0kU@e+u
zXqJI7U<|&sJXWdD-Pm~J2RKlL>i}K{4lC?@d~OcgXkeR7@O>l*!1uxPhF**iU<{h3
zXqrNrlC7>XH9t>xV?%&<DF`gQ4p5q&M!Q|i?c2D!cA*m!NDv^N2d+C#kY#yz;uuX5
zY_o}})$mFsf-ux1ijF9p5KvE`>IH#%VJJ8b+1eTkxZAhG<mA8$aou5x_D^1bXZ3m>
zLf0iImnDg!*{iSs-0^@p*Y^dH{FIJ^b~<FLIOQ@DhDbpqk^{#v+UsE-K14em2DT!2
zzF*}3EO5sYn2^nd)Sqjb=7vSwMbIP}Xt6eCT7(ip07s#2(sY=91(>yC-$h8svf;nY
zdsWGjr0}3t)WPprl02!#i1c%te)<j4P$XXy$;tYui7`XMz9vxw(Cxxq00+3Bs?uFw
zM~xY3nnIEcPOeEZ$eOYBG#!xHI416N6!`8X=m9t$oCkXCdR;LF3g9F`dp+p&a^OOX
zd9MefWNAvPRzp<<_@cN7=K$OXK99Ryc~GwpFR%dX_0VoN*C-ll@vpx>X|-sttts$p
z6_&<&Q3{{<@b>!Z>P~NRQo@;;VL=&_w~it^ig*{5oFrtO4)<=|Qmj>l4+QKZ?fME-
z1ulum<n-dAlxJu20{gp4PE*o$o3)!a)g*}kA3hDAZTaB*2+!O6PNqwh3YGbJyizGA
z*wpN79Mh`RXg3;)sw#Z68T=6ffMr<l;8TS+0SUrTgK}9s-$xvWEJ;YCh^W(1R7Kzy
zf%gx><$ruKN98K)?{~!`z|KuZ4;8)zzO2I1Xw3gL!QlA?xdyuxb_@6ljWXPM3KISg
Z@)uznntNY-5*Gjf002ovPDHLkV1kbo7+L@T
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/breakpoint_disabled_16.png b/src/plugins/debugger/images/breakpoint_disabled_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e5381450764d557a06adb9743e0bb1f427b09af
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3<4*SDKUls00L!6L_t(I%WacCNLx`9#((cmG=Cgah}hUlFeRi@MFQGRI(2dpsfB`b
z2cer#x@*O$OEWuk5X40&bn2ju4QSgerVRmYnnX;h#%Pk4<h^%0<k~*lT==-$bMJS~
z`OZB@p~Kn(R}&s;5CpK`r~x0R!2I{E;yiqS9<Q#y=$oB=-aj*=dGFn`0BWg}cDA``
zoo{TscAMtXeW?ByH4a0`NaWk)?rz0yG|EDVQzz_3qg;u{E6H&9APz$}$nT*0ODL4A
zrBWp!#Gw!(D}=}iA@UMAX*;Z?Ql+n<(C0mH0jL1|s=6?|vNGU_L<)cbG->O#B}{2E
zJdsG@_VV&AOH~&Dls#~{$Hz~?TU&=NzuyErfE(xnbeZHI2SD8{mGtk^)4_v8VnDTE
z!aFvmx%~bUpuyit>p-`J(@{hB`%k>1qpmwJp$oX%H8@zNUD<1r4QMhO9CBJRi)vRO
zP*xzU1K5UP0~Ln@k0gl>5~@H&v^nSsWQ=sW58E!Is+x?f%K~4^sREb41#p3Fm+R?t
zuYj~#gIyz&u`4?}-9QQWCHEq5EKzjcRkpX?MmlZ%giq=en5|syRWTNu#59kA0+0i;
zzz>P6v=uPT<6<l}Y2@=ukHJ!|dtVC%6Ft%B`N-PZy6W}z06zJZNc~m2R=di~&p)Z{
z@Aq0qN8?dwDb7}Q2LkV1e!tQ;H}`gEaWR9YwZE^~wDPN~p|kb%r{?LYWfuyMqHSq6
zhbalZme2PRU4MqAS*pjA1+eS&VJu4%mi0!tx>|}tt>ZL0rc(F917L)917r+HbQ<U1
X$c->eo|BM+00000NkvXXu0mjf5`a(J
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/breakpoint_disabled_24.png b/src/plugins/debugger/images/breakpoint_disabled_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c598df70225b68e3a30ac558c0544088f32d164
GIT binary patch
literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3<DFXhV*g(00b~eL_t(Y$DLM7NL*JK{_Z{Zj$@qZbbL;u*cwA2ix|^jeH7X*s)TH6
z0%;*;AvO)A+d#I3W|i00MbU1G77W339SAg#suP8pW+gHW>b2vTxih2lxR3Mb!gJ*~
zwQ14=-{PLf_y7O*|L6Wk!)p!!=ud%W0O$cS8o*!Yoc5~4CqO3wMl{11Hrv{|YTDWe
zgn(;V%-h&l2Bi-OFx3O3@FpV(B<6sL<x{6<dVE~Cmc^LkFz&jPyDnvp!(7W^>G5&#
z`-u~D9{3>%BwmYr4)`cpTbtRudson0&gGuBBZRPp5V<PY-1Bz)Y}Vbpc~dNe!|4T}
z|CQvw0Rv0%xMR=GGFm9uLI_I;u_=T|OKeF5-<v`RixvvDeg8gNipQNfp!d)mECTOv
z(_HSDoNS1nKfg&L5f6Z_KvVV$2_AqIi=o`??9tSfD;eQ=-F?6o<Us&{58P<FdbR1T
z!NCm@iR1xz04M+^!K)C=Qve=`MDnr0!HuS|u>^qc172N9b3D}CJlZ%iVuuom^qxIX
z2`;@oq;kQPeZHAUq#G|^&Y6vkV^4t2eFFp-iJd)5LLD7{O3!`iT_8muPqkdZI+JI-
z@Udg5*tv5C0WPT$eO`CwOgYrjlBtr0E4eZNm=cDP53WjOCK8#t)2Ax{h5<mI0f-)p
zb%k163(z!2k%uYX6G<A9Fyx%3L_h)f&@{(vYb%gwv`YZG{vOaoqEQ0QcL6v6+(V)W
zA_z+a5ghPdo^>F^E{VmA1)#|Q0L?VP%Vi3nB0VFD9I7F4h%EjAa-bs0WvZDb0Kj+w
zY<Cum%+F-P07^<Ci6TuPNsyC(&{c^6lmV3dOeV~WMcNB&8(#n{St|YESym@FFG1I<
zD<&ueCL@y922Mbzpa{-O-uikIFBYF^0M`M4m&>!x%1U(S@#D7v>{Ov3kq3~I$Sd;)
z_7@&Ks&`gbBdk(+uwSMen08VrmYtsdL?Os2umNNNyp+hwxm=aeygf7Xv6D(M0!+y}
z2229>SEbUsdTs3x&E?jk{rxYLTN)%W(0NY^V7JQqeERn7lg0V@&q~jqPxLbO)4l-!
z_?prr_x(}Nvid;CQeAiVUy?jXWJS?@w_3jK$;qQHr>DPlQ>hHg=f9lT+jp>|%>#Wk
z?d`vkSWJrz4UM<oxib%-R@T0$B%CXWuB=_VHc)u@@EckvFn4Y3(|%y#Ut4C<Fa}6N
z!>k?-Hyic!i}8yWe{Q{geHDZdC1M7~n04#car@rA5oX&T@Jc03ZTmtmrE~w;laoLK
z(dZ4`G)JLnhGv>sBNAEBj~vMgAv95`)YD?|ec}5J5P}Nd|55Dje)l1eexs(pSX0wU
zg}9_^+Ax5V>OBxbJQKh#MAxT!94Ga^UKLe8f9)yIBA+c=+TlIoALDPbt5Yhamc6k6
O0000<MNUMnLSTY}dn5$_
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/breakpoint_disabled_32.png b/src/plugins/debugger/images/breakpoint_disabled_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..1de84920c2dc6ea7347d94c6035429f72e36283d
GIT binary patch
literal 1622
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
UU;<BXJOBUy07*qoM6N<$g4T!iOaK4?
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/breakpoint_pending_16.png b/src/plugins/debugger/images/breakpoint_pending_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..fca0815a7c16719858738e68b325bc192478f726
GIT binary patch
literal 872
zcmV-u1DE`XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3<?iyMH6%Y00QVqL_t(I%Z-!YYaDeH#XsNg%<Qjjx41NEHYtK@+D62*OH)%KNUG9j
ziy)2qScv%KKOp!bh%X8n2>2jEF;t2#QVLoqDr#+ulAtN;+Mj8NlQ!M#%+Aj2?9BK2
zu(S!{g9i>5F89Da_iz>4a1rbRyq>Ss-pp33&p73BK5^Z4x6!!NxpwX2XW^Uz;lFSN
z4*Whjxw3KQOcLL|ExnbMKJVO-?#-Lx&d;ZdV`IPm2!q>o3g9Og-LZfFZ`HZE9hsdw
z6<UK*eTskxVhqvRnz=DMd)KV5k551gz!FevT3@Wp%#7qK6)j=NBX&AS5FqU~;(6#a
zRjKb6I`#VKry^$o>`QPWW82l7W$Dy)(b+6G4%l{o17p~{muJ--MkzyDc-7f>YTqlL
z4V?VohC9BXE?d@xUBkmKK6daRnZt)s#Ud(~1It2bjTpni*%Lf|d<ZAI<voev@@Y0~
zjG4%mN=O`&G#cokAylb^&gBrxf+S&dXo+t=?_#0JTNd43k03R&EBnN0+lUk`+Xk(X
zB*FMTI!!T!0xF+JIvr}e&+&fy6h|u+ULG0Y!tyfn*Z)lKi@dFsQmr(O!I(!BV<1WT
zM@$kVO_?0r!%}k-jG-R)7}t6eKm*@Lt(K4^NUw)P5yUa(VG3c0#4)Fyta8P5`SR%r
zzHNCjlcrw)=v3q*e|<ePVTeQ#5{8&|8wmnT5cFdV0t#`=SjNGu+(K<WkWu&$Ku^JU
zBJ#uidOea(r=Pj+V>}OOwffcfS$18Vy?dE{=><75HMMpO4n4F$lBTb9n$3Ie;$k;x
zHj(XO&%<~gpZs;5Lr0Fv-`Y|8jvdbwi^X>VY=9|v@QX;T>-!6<SFcVN%4NxxN*T*>
zNaGl<X}ZmzmT4^QQ7SU5uI2}Jhttj*d_AcC{Zv20q=J)L>*o!Wl~V3k^2fk)?;NPw
ynXS1vg!AulOYuK2i_F=1-qO}q&m_=`IR6hEu9%<XoIjla0000<MNUMnLSTYz5tp6-
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/breakpoint_pending_24.png b/src/plugins/debugger/images/breakpoint_pending_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..458d3c3b9e6df05145558a8793f06d688a59f799
GIT binary patch
literal 1366
zcmV-c1*!UpP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3<@N``RX(P00h=aL_t(Y$DNj2Y*bYghQEEznOkSDolYyX+yViNauGxz+`{ES1x3&(
zsEN@KF_ECYnHV2X9!!)c6L`=U6MZm<(1aKRCIlsEXayl=C<aL@1t~3zZKu=Doa<gb
zoStb5qS2MCti8|9{{MB`D@Sn;>410%HUV4BRBEMBUq97|#p3?JK(Ajc=7D1d99;o_
z@?Yc>SZCn1^D}4Oy8hmKGSu2CUZEg<u^8&$pp^4@={<N*F0NSNw88!hP<JmpHGXpr
z8Um%hY23AI-Q?Z7u`(G9(*&g^-V#ByCh&a*zx$3Gd-wM0p`oXj!`XWhoQB3Yv`*f$
zXKv$;9mG;8FpM$q$cl_v5dz1dl+SbRt+yP{aUNd<KaMA`qO`=}>%{EYbL%&5#H>`%
zjsu2)QYr)=ABEP42xyHGA>G_e?dHw#{+5;_t*~@8bWb2i!mGgg?2;u|j)V675Zp8o
z!<ZP!sOM-6L4atD3Iei=7pwl3mYfOuf$dd-4u}uKKEtwfrmoJ=gM(mMU|A^B4DFo+
zTBChUaWDy<hCmaPYLUhzREovt4o`Y&>xHII+CIFf`cyk?6KKiKm_c^oLK17%KrDue
z$5F9ZNESsgO5iz)Lx-MZ+WJOnoA2%%(a>=mZe3x&rC}RDI+sJrW&F-g%&Ak6L?R@y
zEHKRp1bsIq(^qIDR}8`KA{ZqR;SEc{3M(ELE0t0h20>pR0+<aAkW9j86v{NK1i8dD
zGRYx2PTcp;k4o{aYJ*}ToxZPW@nTd>O{l39DxJp2WWsea8Kz4q#Pblx!7jnRlQ%ih
zeVvb1ucqEGz;*e)vy;Px0;}S)56l_(^leK)Lf!e0M)%@*VQQkTQ3`Qg#C3^_gH1bK
zBbTVF$#B1Ef@!0JU+5b7gNH`wd7sa;A<*M{-dOuZU|LUDi{~M(3qeplTietW&aFbB
zdiS@H5t6_{_yNEGE(NYD;``O!CJ4ayksv^PznT_t-Ei&u;QMTuKAi`$S-!m4$Cca^
z@{^}=vRr1XY59-Ag^1voh^TUZe+U+-=RpKGnwE$p`i|@J&b)d2@_Q$3*+!1rF23vX
zV&I?H05*VO!BM~->gf@DA0lAaMQj^vI|Pn2+S@j`E>AQx5L1fEuX##8x3NrwDe!qz
zPUBH100*3MS(SQvs@@WT*)~!xhgzwO>FC+vt5*S-U!P-sDkWz?9*6T0feG*moHOBN
zyI9O5YHE~~NQ@OcDryi^ql>KPIJ}<E^XB&LY}m1b1q<eL_WHF_S8s1E@NHBB*1~|m
zvm#>Ox_nuNdwN0-BX6S!q9{h~;qGqIvt}{-;YYaUX|84)_2#Fy4%gP!?gXY+rzyZn
zX#WYG&>}|*ot?Q#e?Qq7GqBR>a8%qm>>P*o8#lP@x^(<mBC9(Q5%c23%gx1N5nvH;
z-5USCmc!{*SZcw?BLf4^j|>c`cq%3FOh#F;7|JjRTo<oW;r4J&kQdZkEQZf6B1ome
zoOj20kV!PLZv7lyI;HM4M%rL0uoHL&Xc~WJbAS0rtSh$ZgLEui|M%0h?F;B?<D~kx
zp8x@M7N!YIQxFsA{fgVo71eNR<}yfT?!Kcn-0XnTZHkKjA<rXb9UM`xC2Ewv5gT~-
YFF8HH;~-tc)&Kwi07*qoM6N<$f;9Am761SM
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/empty.svg b/src/plugins/debugger/images/empty.svg
deleted file mode 100644
index 46209de3910..00000000000
--- a/src/plugins/debugger/images/empty.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="14"
- height="14"
- id="svg2243"
- sodipodi:version="0.32"
- inkscape:version="0.45.1"
- version="1.0"
- sodipodi:docbase="c:\depot\research\main\editor\images"
- sodipodi:docname="location.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2245">
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="64"
- inkscape:cx="8.3920091"
- inkscape:cy="7.4257237"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="14px"
- height="14px"
- showborder="true"
- inkscape:window-width="1600"
- inkscape:window-height="1174"
- inkscape:window-x="0"
- inkscape:window-y="0"
- gridempspacing="2"
- showgrid="true"
- inkscape:grid-points="true"
- gridspacingx="0.5px"
- gridspacingy="0.5px" />
- <metadata
- id="metadata2248">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- </g>
-</svg>
diff --git a/src/plugins/debugger/images/empty14.png b/src/plugins/debugger/images/empty14.png
new file mode 100644
index 0000000000000000000000000000000000000000..7346e58082a73c185e6393a51ab7a736e08d7dce
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xawj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwei<?_ReO1ic?LZ;f64!_l=ltB<)VvY~=c3falGGH1
z^30M9g^-L?1$R&1fcGh?c|e5%o-U3d8t0P}Bv=<Gh$OHxFv~G8S}a^F50qo@boFyt
I=akR{01GH8R{#J2
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/location_16.png b/src/plugins/debugger/images/location_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f934d814928da0bf269122982d4f3cf466ced6b
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3==!n@lM$Q00G2FL_t(I%gvKNXj5Sn#n1h|FE0^Z6-#L(O0=4>Lo5yzs-P%>6f1VF
zgAU@<B?#)`&_N7Qa4$Gysvw3!5jqGWf)pJT#b~WGHZgyYhj~f*-uM1ox1u#6I0)YL
z9DeuQ0~h#jXW{O?!Nu&}qy2oMm#{;J=D_gii^9E;+|vD2^sfN`FtmRHN6uzvqh`EV
z$R!SU^U&jL;#60Gkvx#TIG-9n1IKpx^UA}p_GNj_{85@aaSQ&I@9Bfn93MFrk`%$O
z0A?m5Hl*UIJpce-hp4W8@V~xYSnafG)8{kQ_W(f8@{>GzavCy1eT!uV>_#(Od%YAk
zt8Z?+YFBb<vsp&RdJY-UVD>>|fP?`dcR{K_2s!W@#N18d;Mj5T>7{dL3`i@dU5B=d
zFk+FeTS+L8G(jQ?aEL~!&g<{id{B_*P|qp=__$Kh%8<eKybLx{=|d7|!*eZ^ie;x`
zZ?-tV%+$5=697;|bVa)w+Wq6;Bm*~FmV#}4N2Bu1BMJ&a%d3;uOV(DxUWF~*P9#G~
z>qcy+tDTku;!9JRjYr#ks$cV-YcB`zE?>yh>fQ9708a*vL}cb%W+VSkpYA9BAGl@m
SLo)6F0000<MNUMnLSTYhegKUC
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/images/location_24.png b/src/plugins/debugger/images/location_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..b66a3a6cc7e9c8191762e0e5a729a96a4c26997f
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM#
z3=|up-uTu400NpxL_t(Y$L&>3NK{c2{_eZiKV;sZHEKHk5n5RiS&JZA6wyMF*@c?|
zD~bprM5RTbTNxLkZGvjmA_}6B(M=TXTGgi1MVT|rjOJ^6gERAH=FPnKP7BlW2Yto_
zEjn=E!ae7H=kI<8_%HdA7sFL8f8xjN8v497egFxbvzr%s!m3?A$#y7&y2fMOU8THa
z+UKq5$U6XI2)P<gqpf|kQg*fYeO~v2$<cB-ZvX_4kxfCabfWd#UDUUBT`>*$!??HR
z?6!f854*3~0wB77^!yN9ja48JvYG`o62RQMN2Db}_jnR_ItS-dn*jVHO;p`%ucT$w
z$FaBJS5?d$AsJ00G&KPw_~x@@(WTD5$lG-QlVdG(@Ki74ilVIxvq1_=_=e1Y)N&3>
z!A}&LdQMq=d00-0fir`F%t{Z)g2Yo0h58nn-K3V8UZ-TGQQ|OA)l|otPF`ltiX;7r
z(%gIBQ0)l-U=t(F)Y#SuSA7x4%794!IW-)BfW#e;xC|y0+i4Wy(KNoz&OrI{3MS<S
zgpt#r%#Oq1+_(LhO2y!!9Fi!5B%F}A1B?{_OajP&Wu>7fRD`FeNnMy@mSyN1?4?-!
z(2T_P(U}HJQ-P@~8<9a|LJ7nWnT--z1Y$JCwUwz70I(d@5csIrnxxtT>oe8USp;Vy
zNX63t5Mn^Lr+5DK>it^SOA9eu04}$C?HpTNf)ZIEGKm4~VL?%<r~Q^1|J`12!S~yF
z*fLB%0f#aghndUb`}|jAv?Lg45nxw6ec_3GuxW=}UXMg9OhhIF@MI@;6}w>5Jzzjw
z4FZ4)!VOP<<k?PcVi#<hS^3w@hl1>N&uwMVj-S{Cn}z{)(bE@x{8v`y)4{`q|Ku+J
Y0T(DOjle%u^8f$<07*qoM6N<$g4x<>3jhEB
literal 0
HcmV?d00001
diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp
index f769f2279e9..4f79e2d54e5 100644
--- a/src/plugins/debugger/snapshothandler.cpp
+++ b/src/plugins/debugger/snapshothandler.cpp
@@ -110,8 +110,8 @@ QDebug operator<<(QDebug d, const SnapshotData &f)
SnapshotHandler::SnapshotHandler(QObject *parent)
: QAbstractTableModel(parent),
- m_positionIcon(QIcon(":/debugger/images/location.svg")),
- m_emptyIcon(QIcon(":/debugger/images/empty.svg"))
+ m_positionIcon(QIcon(":/debugger/images/location_16.png")),
+ m_emptyIcon(QIcon(":/debugger/images/empty14.png"))
{
m_currentIndex = 0;
connect(theDebuggerAction(OperateByInstruction), SIGNAL(triggered()),
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 58ffced917d..39831c42be5 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -113,8 +113,8 @@ QDebug operator<<(QDebug d, const StackFrame &f)
StackHandler::StackHandler(QObject *parent)
: QAbstractTableModel(parent),
- m_positionIcon(QIcon(":/debugger/images/location.svg")),
- m_emptyIcon(QIcon(":/debugger/images/empty.svg"))
+ m_positionIcon(QIcon(":/debugger/images/location_16.png")),
+ m_emptyIcon(QIcon(":/debugger/images/empty14.png"))
{
m_currentIndex = 0;
m_canExpand = false;
@@ -287,8 +287,8 @@ enum { IdColumn, AddressColumn, FunctionColumn, FileColumn, LineColumn, ColumnCo
ThreadsHandler::ThreadsHandler(QObject *parent) :
QAbstractTableModel(parent),
m_currentIndex(0),
- m_positionIcon(QLatin1String(":/debugger/images/location.svg")),
- m_emptyIcon(QLatin1String(":/debugger/images/empty.svg"))
+ m_positionIcon(QLatin1String(":/debugger/images/location_16.png")),
+ m_emptyIcon(QLatin1String(":/debugger/images/empty14.png"))
{
}
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 04da57ec41d..bb0c7495a66 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -198,7 +198,7 @@ void HoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, int p
if (!m_helpId.isEmpty()) {
if (showF1) {
m_toolTip = QString::fromUtf8("<table><tr><td valign=middle><nobr>%1</td>"
- "<td><img src=\":/cppeditor/images/f1.svg\"></td></tr></table>")
+ "<td><img src=\":/cppeditor/images/f1.png\"></td></tr></table>")
.arg(m_toolTip);
}
editor->setContextHelpId(m_helpId);
--
GitLab