Merge branch 'master' into qt5.7

m-pilia · Oct 17, 2017 · 7d0178a · 7d0178a
2 parents 70cb071 + 1347bf8
commit 7d0178a
Show file tree

Hide file tree

Showing 8 changed files with 455 additions and 6 deletions.
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
@@ -1,6 +1,3 @@
-include(ECMInstallIcons)
-
-ecm_install_icons(ICONS
-    sc-apps-ambientnoise.svg
-    THEME breeze
-    DESTINATION ${ICON_INSTALL_DIR} )
+install( DIRECTORY breeze DESTINATION ${ICON_INSTALL_DIR})
+install( DIRECTORY breeze-dark DESTINATION ${ICON_INSTALL_DIR})
+install( DIRECTORY hicolor DESTINATION ${ICON_INSTALL_DIR})
diff --git a/icons/breeze-dark/apps/16/ambientnoise.svg b/icons/breeze-dark/apps/16/ambientnoise.svg
diff --git a/icons/breeze-dark/apps/22/ambientnoise.svg b/icons/breeze-dark/apps/22/ambientnoise.svg
diff --git a/icons/breeze-dark/apps/32/ambientnoise.svg b/icons/breeze-dark/apps/32/ambientnoise.svg
diff --git a/icons/breeze/apps/16/ambientnoise.svg b/icons/breeze/apps/16/ambientnoise.svg