thooge
/
keepassx1
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't delete QApplication as it causes problems (big font size)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@171 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 17 years ago
parent 1be77c9e10
commit 9de7489805
3 changed files with 9 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      src/main.cpp

18
src/main.cpp
Unescape View File

@ -62,12 +62,15 @@ void initAppPaths(int argc, char **argv);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QApplication* app=new QApplication(argc,argv); QApplication* app;
#if defined(Q_WS_X11) && defined(GLOBAL_AUTOTYPE)
app = new KeepassApplication(argc,argv);
#else
app = new QApplication(argc,argv);
#endif
initAppPaths(argc,argv); initAppPaths(argc,argv);
CmdLineArgs args; CmdLineArgs args;
args.parse(app->arguments()); args.parse(QApplication::arguments());
delete app;
app=NULL;
qDebug(CSTR(AppDir)); qDebug(CSTR(AppDir));
qDebug(CSTR(DataDir)); qDebug(CSTR(DataDir));
//Load Config //Load Config
@ -130,13 +133,6 @@ int main(int argc, char **argv)
} }
}*/ }*/
#if defined(Q_WS_X11) && defined(GLOBAL_AUTOTYPE)
if(!app) new KeepassApplication(argc,argv);
#else
if(!app) new QApplication(argc,argv);
#endif
//Internationalization //Internationalization
QLocale loc; QLocale loc;
if(!args.language().size()) if(!args.language().size())