aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/cplusplus
diff options
context:
space:
mode:
authorAlessandro Portale <[email protected]>2016-10-26 12:38:12 +0200
committerAlessandro Portale <[email protected]>2016-10-26 10:45:06 +0000
commitd54da12af90242d168d883212c0ef27f83c7f4c8 (patch)
tree27a8d1bc7452c5084df910463be1b854f79a78e2 /src/libs/cplusplus
parent9c924f737816476ca249447de972f7338c6d12f1 (diff)
CPlusPlus, Utils: Move namespace icon from CPlusPlus to Utils
...so that it can be used in the ScxmlEditor plugin Change-Id: I0e0ed050f7765bcc901db3bb2c3273456a228b5e Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r--src/libs/cplusplus/Icons.cpp2
-rw-r--r--src/libs/cplusplus/cplusplus.qrc2
-rw-r--r--src/libs/cplusplus/images/namespace.pngbin130 -> 0 bytes
-rw-r--r--src/libs/cplusplus/images/[email protected]bin169 -> 0 bytes
4 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp
index 7a539c67eb8..27e4b92d09f 100644
--- a/src/libs/cplusplus/Icons.cpp
+++ b/src/libs/cplusplus/Icons.cpp
@@ -215,7 +215,7 @@ QIcon Icons::iconForType(IconType type)
}
case NamespaceIconType: {
const static QIcon icon(Icon({
- {QLatin1String(":/codemodel/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
+ {QLatin1String(":/utils/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
}, Icon::Tint).icon());
return icon;
}
diff --git a/src/libs/cplusplus/cplusplus.qrc b/src/libs/cplusplus/cplusplus.qrc
index d0135fdee80..32d9a712495 100644
--- a/src/libs/cplusplus/cplusplus.qrc
+++ b/src/libs/cplusplus/cplusplus.qrc
@@ -8,8 +8,6 @@
<file>images/[email protected]</file>
<file>images/macro.png</file>
<file>images/[email protected]</file>
- <file>images/namespace.png</file>
- <file>images/[email protected]</file>
<file>images/signal.png</file>
<file>images/[email protected]</file>
<file>images/slot.png</file>
diff --git a/src/libs/cplusplus/images/namespace.png b/src/libs/cplusplus/images/namespace.png
deleted file mode 100644
index b36b2a4acfe..00000000000
--- a/src/libs/cplusplus/images/namespace.png
+++ /dev/null
Binary files differ
diff --git a/src/libs/cplusplus/images/[email protected] b/src/libs/cplusplus/images/[email protected]
deleted file mode 100644
index 81109db2b35..00000000000
--- a/src/libs/cplusplus/images/[email protected]
+++ /dev/null
Binary files differ