Merge pull request #1180

0aa3269 add window icon for linux

main.cpp

@@ -30,6 +30,7 @@
 #include <QQmlApplicationEngine>
 #include <QtQml>
 #include <QStandardPaths>
+#include <QIcon>
 #include <QDebug>
 #include <QObject>
 #include <QDesktopWidget>
@@ -91,6 +92,10 @@ int main(int argc, char *argv[])
     app.setOrganizationDomain("getmonero.org");
     app.setOrganizationName("monero-project");
 
+    #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+    app.setWindowIcon(QIcon(":/images/appicon.ico"));
+    #endif
+
     filter *eventFilter = new filter;
     app.installEventFilter(eventFilter);
 

qml.qrc

@@ -165,5 +165,6 @@
         <file>components/RemoteNodeEdit.qml</file>
         <file>pages/Keys.qml</file>
         <file>images/menu.png</file>
+        <file>images/appicon.ico</file>
     </qresource>
 </RCC>