Commit 381de98a authored by Don Gagne's avatar Don Gagne

Unit test changes

parent efeccf93
...@@ -109,7 +109,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[]) : ...@@ -109,7 +109,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[]) :
bool fClearSettingsOptions = false; // Clear stored settings bool fClearSettingsOptions = false; // Clear stored settings
CmdLineOpt_t rgCmdLineOptions[] = { CmdLineOpt_t rgCmdLineOptions[] = {
{ "--clear-settings", &fClearSettingsOptions }, { "--clear-settings", &fClearSettingsOptions, QString() },
// Add additional command line option flags here // Add additional command line option flags here
}; };
...@@ -136,13 +136,15 @@ QGCApplication::~QGCApplication() ...@@ -136,13 +136,15 @@ QGCApplication::~QGCApplication()
void QGCApplication::_initCommon(void) void QGCApplication::_initCommon(void)
{ {
_createSingletons();
} }
bool QGCApplication::_initForNormalAppBoot(void) bool QGCApplication::_initForNormalAppBoot(void)
{ {
QSettings settings; QSettings settings;
_createSingletons();
// Exit main application when last window is closed // Exit main application when last window is closed
connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit())); connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment