fix windows icon installation

qgis · Jun 2, 2016 · 5fd69fd · 5fd69fd
1 parent 07c16fc
commit 5fd69fd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git 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]
+[HKEY_CLASSES_ROOT\QGIS Layer Definition]
+@="QGIS Layer Definition"
+
+[HKEY_CLASSES_ROOT\QGIS Layer Definition\DefaultIcon]
+@="@osgeo4w@\\apps\\@package@\\icons\\qgis-qml.ico"
+
+[HKEY_CLASSES_ROOT\.qml]
+@="QGIS Layer Definition"
+
+[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"
+@="QGIS Composer Template"
+
+[HKEY_CLASSES_ROOT\QGIS Layer Settings]
+@="QGIS Layer Settings"
 
-[HKEY_CLASSES_ROOT\.qml\DefaultIcon]
+[HKEY_CLASSES_ROOT\QGIS Layer Settings\DefaultIcon]
 @="@osgeo4w@\\apps\\@package@\\icons\\qgis-qml.ico"
 
 [HKEY_CLASSES_ROOT\.qml]
-@="QGIS Layer settings"
+@="QGIS Layer Settings"
 
-[HKEY_CLASSES_ROOT\.qlr\DefaultIcon]
+[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
@@ -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