From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: 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 --- src/app/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/app/main.cpp') 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 #endif #include -#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; -- cgit v1.2.3-13-gbd6f