Merge branch '297-windows_icon'

Closes #297
Nitrokey · Dec 1, 2017 · 07ed959 · 07ed959
2 parents f63040e + ee72df7
commit 07ed959
Show file tree

Hide file tree

Showing 24 changed files with 76 additions and 4 deletions.
diff --git a/appico.rc b/appico.rc
diff --git a/images/CS_icon-red.png b/images/CS_icon-red.png
diff --git a/images/CS_icon.ico b/images/CS_icon.ico
diff --git a/images/black_for_light.zip b/images/black_for_light.zip
diff --git a/images/black_for_light/logo_16x16_black.png b/images/black_for_light/logo_16x16_black.png
diff --git a/images/black_for_light/logo_22x22_black.png b/images/black_for_light/logo_22x22_black.png
diff --git a/images/black_for_light/logo_24x24_black.png b/images/black_for_light/logo_24x24_black.png
diff --git a/images/black_for_light/logo_32x32_black.png b/images/black_for_light/logo_32x32_black.png
diff --git a/images/black_for_light/logo_48x48_black.png b/images/black_for_light/logo_48x48_black.png
diff --git a/images/gray_for_dark.zip b/images/gray_for_dark.zip
diff --git a/images/gray_for_dark/logo_16x16_lightgray.png b/images/gray_for_dark/logo_16x16_lightgray.png
diff --git a/images/gray_for_dark/logo_22x22_lightgray.png b/images/gray_for_dark/logo_22x22_lightgray.png
diff --git a/images/gray_for_dark/logo_24x24_lightgray.png b/images/gray_for_dark/logo_24x24_lightgray.png
diff --git a/images/gray_for_dark/logo_32x32_lightgray.png b/images/gray_for_dark/logo_32x32_lightgray.png
diff --git a/images/gray_for_dark/logo_48x48_lightgray.png b/images/gray_for_dark/logo_48x48_lightgray.png
diff --git a/images/icon/nitrokey-app-icon-1024.png b/images/icon/nitrokey-app-icon-1024.png
diff --git a/...es/black_for_light/logo_128x128_black.png → images/icon/nitrokey-app-icon-128-black.png b/...es/black_for_light/logo_128x128_black.png → images/icon/nitrokey-app-icon-128-black.png
diff --git a/images/icon/nitrokey-app-icon-128-red.ico b/images/icon/nitrokey-app-icon-128-red.ico
diff --git a/images/icon/nitrokey-app-icon-128-red.png b/images/icon/nitrokey-app-icon-128-red.png
diff --git a/images/icon/nitrokey-app-icon-256-red.ico b/images/icon/nitrokey-app-icon-256-red.ico
diff --git a/images/icon/nitrokey-app-icon-vector.svg b/images/icon/nitrokey-app-icon-vector.svg
diff --git a/images/icon/original/black_for_light/logo_128x128_black.png b/images/icon/original/black_for_light/logo_128x128_black.png
diff --git a/.../gray_for_dark/logo_128x128_lightgray.png → .../gray_for_dark/logo_128x128_lightgray.png b/.../gray_for_dark/logo_128x128_lightgray.png → .../gray_for_dark/logo_128x128_lightgray.png
diff --git a/nitrokey-app-qt5.pro b/nitrokey-app-qt5.pro
@@ -3,6 +3,7 @@
 CONFIG   += qt c++14 debug
 QT       += core gui widgets
 
+
 target.path = /usr/local/bin
 desktop.path = /usr/share/applications
 desktop.files += nitrokey-app.desktop
@@ -105,9 +106,7 @@ INCLUDEPATH +=  $${SRCDIR} \
                 $${GUIDIR}
 
 
-win32 {
-    RC_FILE=appico.rc
-}
+win32:RC_ICONS = images/icon/nitrokey-app-icon-256-red.ico
 
 macx{
     ICON= images/CS_icon.icns