diff --git a/img/icons/qtox-128x128.png b/img/icons/128x128/qtox.png similarity index 100% rename from img/icons/qtox-128x128.png rename to img/icons/128x128/qtox.png diff --git a/img/icons/qtox-14x14.png b/img/icons/14x14/qtox.png similarity index 100% rename from img/icons/qtox-14x14.png rename to img/icons/14x14/qtox.png diff --git a/img/icons/qtox-16x16.png b/img/icons/16x16/qtox.png similarity index 100% rename from img/icons/qtox-16x16.png rename to img/icons/16x16/qtox.png diff --git a/img/icons/qtox-192x192.png b/img/icons/192x192/qtox.png similarity index 100% rename from img/icons/qtox-192x192.png rename to img/icons/192x192/qtox.png diff --git a/img/icons/qtox-22x22.png b/img/icons/22x22/qtox.png similarity index 100% rename from img/icons/qtox-22x22.png rename to img/icons/22x22/qtox.png diff --git a/img/icons/qtox-24x24.png b/img/icons/24x24/qtox.png similarity index 100% rename from img/icons/qtox-24x24.png rename to img/icons/24x24/qtox.png diff --git a/img/icons/qtox-256x256.png b/img/icons/256x256/qtox.png similarity index 100% rename from img/icons/qtox-256x256.png rename to img/icons/256x256/qtox.png diff --git a/img/icons/qtox-32x32.png b/img/icons/32x32/qtox.png similarity index 100% rename from img/icons/qtox-32x32.png rename to img/icons/32x32/qtox.png diff --git a/img/icons/qtox-36x36.png b/img/icons/36x36/qtox.png similarity index 100% rename from img/icons/qtox-36x36.png rename to img/icons/36x36/qtox.png diff --git a/img/icons/qtox-48x48.png b/img/icons/48x48/qtox.png similarity index 100% rename from img/icons/qtox-48x48.png rename to img/icons/48x48/qtox.png diff --git a/img/icons/qtox-512x512.png b/img/icons/512x512/qtox.png similarity index 100% rename from img/icons/qtox-512x512.png rename to img/icons/512x512/qtox.png diff --git a/img/icons/qtox-64x64.png b/img/icons/64x64/qtox.png similarity index 100% rename from img/icons/qtox-64x64.png rename to img/icons/64x64/qtox.png diff --git a/img/icons/qtox-72x72.png b/img/icons/72x72/qtox.png similarity index 100% rename from img/icons/qtox-72x72.png rename to img/icons/72x72/qtox.png diff --git a/img/icons/qtox-96x96.png b/img/icons/96x96/qtox.png similarity index 100% rename from img/icons/qtox-96x96.png rename to img/icons/96x96/qtox.png diff --git a/qtox.pro b/qtox.pro index 265c7b2fe..dbe17ce62 100644 --- a/qtox.pro +++ b/qtox.pro @@ -187,6 +187,17 @@ win32 { desktop.files += qTox.desktop INSTALLS += target desktop + # Install application icons according to the XDG spec + ICON_SIZES = 14 16 22 24 32 36 48 64 72 96 128 192 256 512 + for(icon_size, ICON_SIZES) { + icon_$${icon_size}.files = img/icons/$${icon_size}x$${icon_size}/qtox.png + icon_$${icon_size}.path = $$DATADIR/icons/hicolor/$${icon_size}x$${icon_size}/apps + INSTALLS += icon_$${icon_size} + } + icon_scalable.files = img/icons/qtox.svg + icon_scalable.path = $$DATADIR/icons/hicolor/scalable/apps + INSTALLS += icon_scalable + # If we're building a package, static link libtox[core,av] and libsodium, since they are not provided by any package contains(STATICPKG, YES) { LIBS += -L$$PWD/libs/lib/ -lopus -lvpx -lopenal -Wl,-Bstatic -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lavformat -lavdevice -lavcodec -lavutil -lswscale -lz -Wl,-Bdynamic