Skip to content
Snippets Groups Projects
Commit 716a4c6c authored by Joseph Mirabel's avatar Joseph Mirabel
Browse files

Parse command line arguments after config files

* so that command line arguments have precedence.
parent 9d4536fa
No related branches found
No related tags found
No related merge requests found
...@@ -62,6 +62,7 @@ int main(int argc, char *argv[]) ...@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
Settings settings ("@CMAKE_INSTALL_PREFIX@"); Settings settings ("@CMAKE_INSTALL_PREFIX@");
settings.setupPaths (); settings.setupPaths ();
settings.fromFiles ();
switch (settings.fromArgv (argc, argv)) { switch (settings.fromArgv (argc, argv)) {
case 0: case 0:
break; break;
...@@ -73,7 +74,6 @@ int main(int argc, char *argv[]) ...@@ -73,7 +74,6 @@ int main(int argc, char *argv[])
qDebug () << "Settings.fromArgv returned unknow error code"; qDebug () << "Settings.fromArgv returned unknow error code";
break; break;
} }
settings.fromFiles ();
QSplashScreen splash(pixmap); QSplashScreen splash(pixmap);
splash.show(); splash.show();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment