From 381de98a3dd4f11d130fecdce87e6140800449a9 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 26 Nov 2014 18:31:18 -0800 Subject: [PATCH] Unit test changes --- src/QGCApplication.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index ec52c99c3..05d6341b5 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -109,7 +109,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[]) : bool fClearSettingsOptions = false; // Clear stored settings CmdLineOpt_t rgCmdLineOptions[] = { - { "--clear-settings", &fClearSettingsOptions }, + { "--clear-settings", &fClearSettingsOptions, QString() }, // Add additional command line option flags here }; @@ -136,13 +136,15 @@ QGCApplication::~QGCApplication() void QGCApplication::_initCommon(void) { - _createSingletons(); + } bool QGCApplication::_initForNormalAppBoot(void) { QSettings settings; + _createSingletons(); + // Exit main application when last window is closed connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit())); -- 2.22.0