aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2017-11-15 11:57:25 +0100
committerTim Jenssen <tim.jenssen@qt.io>2017-11-15 11:59:25 +0000
commit09f02013e5b28e8bc1d74f593b7580c7e9f131c0 (patch)
tree441e4af1b6c4575f2f3289755d6fd4de274086c0 /src
parent4969837ad6891c31753223199169c8390fa1ed93 (diff)
Utils: move 2 images to utils
select.png is used by the designer Change-Id: Icfa0ab4c931de7365c8bd252de0a0f972beb2c6c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/utils/images/app-on-top.png (renamed from src/plugins/debugger/images/qml/app-on-top.png)bin119 -> 119 bytes
-rw-r--r--src/libs/utils/images/app-on-top@2x.png (renamed from src/plugins/debugger/images/qml/app-on-top@2x.png)bin127 -> 127 bytes
-rw-r--r--src/libs/utils/images/select.png (renamed from src/plugins/debugger/images/qml/select.png)bin157 -> 157 bytes
-rw-r--r--src/libs/utils/images/select@2x.png (renamed from src/plugins/debugger/images/qml/select@2x.png)bin246 -> 246 bytes
-rw-r--r--src/libs/utils/utils.qrc4
-rw-r--r--src/plugins/debugger/debugger.qrc4
-rw-r--r--src/plugins/debugger/debuggericons.cpp8
-rw-r--r--src/plugins/qmldesigner/components/componentcore/abstractaction.cpp2
-rw-r--r--src/tools/icons/qtcreatoricons.svg4
9 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/debugger/images/qml/app-on-top.png b/src/libs/utils/images/app-on-top.png
index a6886d99c5..a6886d99c5 100644
--- a/src/plugins/debugger/images/qml/app-on-top.png
+++ b/src/libs/utils/images/app-on-top.png
Binary files differ
diff --git a/src/plugins/debugger/images/qml/app-on-top@2x.png b/src/libs/utils/images/app-on-top@2x.png
index a0b31d9d3b..a0b31d9d3b 100644
--- a/src/plugins/debugger/images/qml/app-on-top@2x.png
+++ b/src/libs/utils/images/app-on-top@2x.png
Binary files differ
diff --git a/src/plugins/debugger/images/qml/select.png b/src/libs/utils/images/select.png
index 2e750c8a94..2e750c8a94 100644
--- a/src/plugins/debugger/images/qml/select.png
+++ b/src/libs/utils/images/select.png
Binary files differ
diff --git a/src/plugins/debugger/images/qml/select@2x.png b/src/libs/utils/images/select@2x.png
index 91470f8be1..91470f8be1 100644
--- a/src/plugins/debugger/images/qml/select@2x.png
+++ b/src/libs/utils/images/select@2x.png
Binary files differ
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index 95a473da2a..27ebd15a9c 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -180,5 +180,9 @@
<file>images/project@2x.png</file>
<file>images/home.png</file>
<file>images/home@2x.png</file>
+ <file>images/select.png</file>
+ <file>images/select@2x.png</file>
+ <file>images/app-on-top.png</file>
+ <file>images/app-on-top@2x.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index 36d3343862..0031175a1c 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -38,10 +38,6 @@
<file>images/mode_debug_mask.png</file>
<file>images/mode_debug_mask@2x.png</file>
<file>images/pin.xpm</file>
- <file>images/qml/select.png</file>
- <file>images/qml/select@2x.png</file>
- <file>images/qml/app-on-top.png</file>
- <file>images/qml/app-on-top@2x.png</file>
<file>images/debugger_restart_small.png</file>
<file>images/debugger_restart_small@2x.png</file>
<file>images/recordfill.png</file>
diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp
index 3fc7fd50b9..006bee3ee7 100644
--- a/src/plugins/debugger/debuggericons.cpp
+++ b/src/plugins/debugger/debuggericons.cpp
@@ -82,13 +82,13 @@ const Icon REVERSE_MODE({
{":/debugger/images/debugger_reversemode_background.png", Theme::IconsCodeModelOverlayForegroundColor},
{":/debugger/images/debugger_reversemode.png", Theme::IconsInfoColor}}, Icon::Tint);
const Icon APP_ON_TOP({
- {":/debugger/images/qml/app-on-top.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
+ {":/utils/images/app-on-top.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon APP_ON_TOP_TOOLBAR({
- {":/debugger/images/qml/app-on-top.png", Theme::IconsBaseColor}});
+ {":/utils/images/app-on-top.png", Theme::IconsBaseColor}});
const Icon SELECT({
- {":/debugger/images/qml/select.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
+ {":/utils/images/select.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon SELECT_TOOLBAR({
- {":/debugger/images/qml/select.png", Theme::IconsBaseColor}});
+ {":/utils/images/select.png", Theme::IconsBaseColor}});
const Icon EMPTY(
":/debugger/images/debugger_empty_14.png");
const Icon RECORD_ON({
diff --git a/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp
index b439abbf23..4ad3d73b02 100644
--- a/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp
@@ -33,7 +33,7 @@ AbstractAction::AbstractAction(const QString &description)
: m_defaultAction(new DefaultAction(description))
{
const Utils::Icon prevIcon({
- {QLatin1String(":/debugger/images/qml/select.png"), Utils::Theme::QmlDesigner_FormEditorForegroundColor}}, Utils::Icon::MenuTintedStyle);
+ {QLatin1String(":/utils/images/select.png"), Utils::Theme::QmlDesigner_FormEditorForegroundColor}}, Utils::Icon::MenuTintedStyle);
action()->setIcon(prevIcon.icon());
}
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 2cfb5042d2..330f803af6 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -4166,7 +4166,7 @@
</g>
<g
style="display:inline"
- id="src/plugins/debugger/images/qml/app-on-top"
+ id="src/libs/utils/images/app-on-top"
transform="translate(16,0)">
<rect
style="display:inline;fill:#ffffff;fill-opacity:1"
@@ -4202,7 +4202,7 @@
</g>
<g
style="display:inline"
- id="src/plugins/debugger/images/qml/select"
+ id="src/libs/utils/images/select"
transform="translate(32,0)"
clip-path="url(#clipPath6003)">
<rect