]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Use the current window icon in QIcon::fromTheme()
authorR.J.V. Bertin <rjvbertin@gmail.com>
Tue, 22 Nov 2016 16:55:34 +0000 (17:55 +0100)
committerR.J.V. Bertin <rjvbertin@gmail.com>
Tue, 22 Nov 2016 16:55:34 +0000 (17:55 +0100)
This prevents removing the application icon when icon lookup fails, on
Mac or MS Windows.

src/main.cpp

index 8987d351f058d5b02a67c982ca51c937edc89ecf..acba8daeddb1c1d9704c24affd416752e06b390f 100644 (file)
@@ -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();