From 6ef8e482c3ab7158ded2ac561c643d8293f89d79 Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 30 Jan 2022 16:08:02 +0100
Subject: [PATCH] Set window icon in the whole application instead of in
 BaseWindow (#3554)

This makes icon visible on Ubuntu 20.04 while using AppImage build (and possibly some other setups as well).
---
 src/RunGui.cpp             | 2 ++
 src/widgets/BaseWindow.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 990366b0..5c4ea9f2 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -79,6 +79,8 @@ namespace {
 
         QApplication::setStyle(QStyleFactory::create("Fusion"));
 
+        QApplication::setWindowIcon(QIcon(":/icon.ico"));
+
         installCustomPalette();
     }
 
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 9725ee73..008c55a6 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -130,8 +130,6 @@ float BaseWindow::qtFontScale() const
 
 void BaseWindow::init()
 {
-    this->setWindowIcon(QIcon(":/images/icon.png"));
-
 #ifdef USEWINSDK
     if (this->hasCustomWindowFrame())
     {