Fix race condition and deadlock in the version plugin

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2cc794a543f138d0aa3c248d12ad206298878b70..39ecee8b8b327b5283197d160d3def2580c020e3 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "2.0.95",
+                     "2.1",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@info:credit", "(C) 2006-2012 Peter Penz"));
@@ -82,13 +82,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
-    // Use the native graphicssystem per default, as the scaling of pixmaps is just way too
-    // slow with the raster graphicssystem (see KPixmapModifier::scalePixmap()).
-    QApplication::setGraphicsSystem("native");
-
     DolphinApplication app;
-    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
-
     if (app.isSessionRestored()) {
         app.restoreSession();
     }