From 5fd69fd38460947ecce68176ea938b9e949af7bf Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Thu, 2 Jun 2016 21:22:41 +0200
Subject: [PATCH] fix windows icon installation

---
 ms-windows/osgeo4w/qgis.reg.tmpl | 37 +++++++++++++++++++++++---------
 src/app/CMakeLists.txt           |  2 +-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/ms-windows/osgeo4w/qgis.reg.tmpl b/ms-windows/osgeo4w/qgis.reg.tmpl
index 77bfe084b42..fd19723b37d 100644
--- a/ms-windows/osgeo4w/qgis.reg.tmpl
+++ b/ms-windows/osgeo4w/qgis.reg.tmpl
@@ -17,21 +17,38 @@ Windows Registry Editor Version 5.00
 [HKEY_CLASSES_ROOT\.qgs]
 @="QGIS Project"
 
-[HKEY_CLASSES_ROOT\.qpt\DefaultIcon]
-@="@osgeo4w@\\apps\\@package@\\icons\\qgis-qpt.ico"
+[HKEY_CLASSES_ROOT\QGIS Layer Definition]
+@="QGIS Layer Definition"
 
-[HKEY_CLASSES_ROOT\.qpt]
-@="QGIS Composer template"
-
-[HKEY_CLASSES_ROOT\.qml\DefaultIcon]
+[HKEY_CLASSES_ROOT\QGIS Layer Definition\DefaultIcon]
 @="@osgeo4w@\\apps\\@package@\\icons\\qgis-qml.ico"
 
 [HKEY_CLASSES_ROOT\.qml]
-@="QGIS Layer settings"
+@="QGIS Layer Definition"
 
-[HKEY_CLASSES_ROOT\.qlr\DefaultIcon]
+[HKEY_CLASSES_ROOT\QGIS Composer Template]
+@="QGIS Composer Template"
+
+[HKEY_CLASSES_ROOT\QGIS Composer Template\DefaultIcon]
+@="@osgeo4w@\\apps\\@package@\\icons\\qgis-qpt.ico"
+
+[HKEY_CLASSES_ROOT\.qpt]
+@="QGIS Composer Template"
+
+[HKEY_CLASSES_ROOT\QGIS Layer Settings]
+@="QGIS Layer Settings"
+
+[HKEY_CLASSES_ROOT\QGIS Layer Settings\DefaultIcon]
+@="@osgeo4w@\\apps\\@package@\\icons\\qgis-qml.ico"
+
+[HKEY_CLASSES_ROOT\.qml]
+@="QGIS Layer Settings"
+
+[HKEY_CLASSES_ROOT\QGIS Layer Definition]
+@="QGIS Layer Definition"
+
+[HKEY_CLASSES_ROOT\QGIS Layer Definition\DefaultIcon]
 @="@osgeo4w@\\apps\\@package@\\icons\\qgis-qlr.ico"
 
 [HKEY_CLASSES_ROOT\.qlr]
-@="QGIS Layer definition"
-
+@="QGIS Layer Definition"
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 3f428465fc8..6e68b411e04 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -657,7 +657,7 @@ IF (POSTGRES_FOUND)
 ENDIF (POSTGRES_FOUND)
 
 IF(MSVC)
-  INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
+  INSTALL(FILES qgis.ico qgis-mime.ico qgis-qgs.ico qgis-qlr.ico qgis-qml.ico qgis-qpt.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
 ENDIF(MSVC)
 
 INSTALL(TARGETS qgis_app