set global program icon via KAboutData, not directly

svn path=/trunk/KDE/kdebase/apps/; revision=799282

diff --git a/src/main.cpp b/src/main.cpp
index 28a69390f71be6e0a8db86189df0224b5b482a0e..a080541d9e989199ccd9c801e357d1f14057aae3 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,6 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <kicon.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>
@@ -62,6 +61,7 @@ int main(int argc, char **argv)
     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");
+    about.setProgramIconName("system-file-manager");
 
     KCmdLineArgs::init(argc, argv, &about);
 
@@ -76,7 +76,6 @@ int main(int argc, char **argv)
     DolphinApplication app;
     // the .desktop file is not taken into account when launching manually, so
     // set the icon precautionally:
-    QApplication::setWindowIcon(KIcon("system-file-manager"));
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {