aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamarque V. Souza <lamarque@kde.org>2012-02-13 12:14:27 (GMT)
committerLamarque V. Souza <lamarque@kde.org>2012-02-13 12:19:58 (GMT)
commit5a2669f151e65dca5adededade2b30cc40dc7c0f (patch)
tree3a5a8fda81cf4b50a3ce715d7b899c43487eafd6
parent1f68e12cd8ac310f75eb7f8d62b0a7afe8aad601 (diff)
Always install networkmanager.png icons regardless which backend is
going to be compiled (networkmanager-0.7 or networkmanager_fake-0.9). networkmanager_fake-0.9 does not install any icon, then when using Plasma NM from branch nm09 there is no icon for it. Plasma NM's master branch currently installs the icons, I will remove them from master branch to prevent conflicts with this commit. CCBUG: 293711 (cherry picked from commit e5a73150a2bf9a0b0e4c3520c89ec981a097f333)
-rw-r--r--solid/CMakeLists.txt1
-rw-r--r--solid/icons/ox22-app-networkmanager.png (renamed from solid/networkmanager-0.7/ox22-app-networkmanager.png)bin1309 -> 1309 bytes
-rw-r--r--solid/icons/ox32-app-networkmanager.png (renamed from solid/networkmanager-0.7/ox32-app-networkmanager.png)bin1802 -> 1802 bytes
-rw-r--r--solid/icons/ox64-app-networkmanager.png (renamed from solid/networkmanager-0.7/ox64-app-networkmanager.png)bin4028 -> 4028 bytes
-rw-r--r--solid/networkmanager-0.7/CMakeLists.txt2
-rw-r--r--solid/networkmanager_fake-0.9/CMakeLists.txt2
6 files changed, 1 insertions, 4 deletions
diff --git a/solid/CMakeLists.txt b/solid/CMakeLists.txt
index e6ddc36..e0079ad 100644
--- a/solid/CMakeLists.txt
+++ b/solid/CMakeLists.txt
@@ -3,6 +3,7 @@ macro_optional_find_package(NetworkManager)
add_subdirectory(kcm)
add_subdirectory(solid-actions-kcm)
+add_subdirectory(icons)
IF("${CMAKE_SYSTEM}" MATCHES "Linux")
add_subdirectory(solidshell)
diff --git a/solid/networkmanager-0.7/ox22-app-networkmanager.png b/solid/icons/ox22-app-networkmanager.png
index d195b7f..d195b7f 100644
--- a/solid/networkmanager-0.7/ox22-app-networkmanager.png
+++ b/solid/icons/ox22-app-networkmanager.png
Binary files differ
diff --git a/solid/networkmanager-0.7/ox32-app-networkmanager.png b/solid/icons/ox32-app-networkmanager.png
index efba7a6..efba7a6 100644
--- a/solid/networkmanager-0.7/ox32-app-networkmanager.png
+++ b/solid/icons/ox32-app-networkmanager.png
Binary files differ
diff --git a/solid/networkmanager-0.7/ox64-app-networkmanager.png b/solid/icons/ox64-app-networkmanager.png
index 9c6dbac..9c6dbac 100644
--- a/solid/networkmanager-0.7/ox64-app-networkmanager.png
+++ b/solid/icons/ox64-app-networkmanager.png
Binary files differ
diff --git a/solid/networkmanager-0.7/CMakeLists.txt b/solid/networkmanager-0.7/CMakeLists.txt
index 16aa9b2..df0a4ca 100644
--- a/solid/networkmanager-0.7/CMakeLists.txt
+++ b/solid/networkmanager-0.7/CMakeLists.txt
@@ -59,5 +59,3 @@ target_link_libraries(solid_networkmanager07 ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_L
install(TARGETS solid_networkmanager07 DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES solid_networkmanager07.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends )
-
-kde4_install_icons( ${ICON_INSTALL_DIR} )
diff --git a/solid/networkmanager_fake-0.9/CMakeLists.txt b/solid/networkmanager_fake-0.9/CMakeLists.txt
index e1f9657..b5f364c 100644
--- a/solid/networkmanager_fake-0.9/CMakeLists.txt
+++ b/solid/networkmanager_fake-0.9/CMakeLists.txt
@@ -38,5 +38,3 @@ target_link_libraries(solid_networkmanager09_fake ${KDE4_KDECORE_LIBS} ${KDE4_SO
install(TARGETS solid_networkmanager09_fake DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES solid_networkmanager09_fake.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends )
-
-kde4_install_icons( ${ICON_INSTALL_DIR} )