From: R.J.V. Bertin <rjvbertin@gmail.com>
Date: Tue, 22 Nov 2016 16:55:34 +0000 (+0100)
Subject: Use the current window icon in QIcon::fromTheme()
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/ded92cc32ada1fd3fc8bcc90d8dc07f6d3ab291c?ds=sidebyside

Use the current window icon in QIcon::fromTheme()

This prevents removing the application icon when icon lookup fails, on
Mac or MS Windows.
---

diff --git a/src/main.cpp b/src/main.cpp
index 8987d351f..acba8daed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
     KCrash::initialize();