copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 2 insertions, 3 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index e313e3c7f..671d313f3 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -31,7 +31,6 @@
 #include <winuser.h>
 #endif
 #include <qmmp/qmmp.h>
-#include "qmmpapplication.h"
 #include "qmmpstarter.h"
 
 int main(int argc, char *argv[])
@@ -40,7 +39,7 @@ int main(int argc, char *argv[])
     //allows to activate main window from other instances
     AllowSetForegroundWindow(ASFW_ANY);
 #endif
-    QmmpApplication a (argc, argv );
+    QApplication a (argc, argv );
     a.setApplicationName("qmmp");
     QIcon icon;
     icon.addFile(":/16x16/qmmp.png");
@@ -59,7 +58,7 @@ int main(int argc, char *argv[])
     a.installTranslator(&translator);
 
     QTranslator qt_translator;
-    qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qt_" + locale);
+    qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qtbase_" + locale);
     a.installTranslator(&qt_translator);
 
     QMMPStarter starter;