src: Fixed command order at startup

This commit is contained in:
Eberhard Graether
2016-03-15 17:12:04 +01:00
parent 23f05c003b
commit 2008d1401a
6 changed files with 33 additions and 17 deletions
+11 -9
View File
@@ -32,13 +32,6 @@ void init()
LogManager::getInstance()->addLogger(fileLogger);
}
void prepare(int argc, char *argv[])
{
setup(argc, argv);
init();
}
int main(int argc, char *argv[])
{
QApplication::setApplicationName("Coati");
@@ -54,9 +47,13 @@ int main(int argc, char *argv[])
if (commandLineParser.runWithoutGUI())
{
setupPlatform(argc, argv);
init();
// headless Coati
QtCoreApplication qtApp(argc, argv);
prepare(argc,argv);
setupApp(argc, argv);
std::shared_ptr<Application> app = Application::create( version );
@@ -72,8 +69,13 @@ int main(int argc, char *argv[])
}
else
{
setupPlatform(argc, argv);
init();
QtApplication qtApp(argc, argv);
prepare(argc,argv);
setupApp(argc, argv);
qtApp.setAttribute(Qt::AA_UseHighDpiPixmaps);
QtViewFactory viewFactory;