Commit 8e83e199 authored by DonLakeFlyer's avatar DonLakeFlyer

Release build fixes

parent bc319fa4
......@@ -138,7 +138,7 @@ static QObject* qgroundcontrolQmlGlobalSingletonFactory(QQmlEngine*, QJSEngine*)
return qmlGlobal;
}
QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool unitTesting)
QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
#ifdef __mobile__
: QGuiApplication (argc, argv)
, _qmlAppEngine (NULL)
......@@ -146,7 +146,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool uni
: QApplication (argc, argv)
#endif
, _runningUnitTests (unitTesting)
, _logOutput (logOutput)
, _logOutput (false)
, _fakeMobile (false)
, _settingsUpgraded (false)
#ifdef QT_DEBUG
......@@ -216,6 +216,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool uni
{ "--clear-settings", &fClearSettingsOptions, NULL },
{ "--logging", &logging, &loggingOptions },
{ "--fake-mobile", &_fakeMobile, NULL },
{ "--log-output", &_logOutput, NULL },
#ifdef QT_DEBUG
{ "--test-high-dpi", &_testHighDPI, NULL },
#endif
......
......@@ -60,7 +60,7 @@ class QGCApplication : public
Q_OBJECT
public:
QGCApplication(int &argc, char* argv[], bool logOutput, bool unitTesting);
QGCApplication(int &argc, char* argv[], bool unitTesting);
~QGCApplication();
/// @brief Sets the persistent flag to delete all settings the next time QGroundControl is started.
......
......@@ -176,14 +176,12 @@ int main(int argc, char *argv[])
bool stressUnitTests = false; // Stress test unit tests
bool quietWindowsAsserts = false; // Don't let asserts pop dialog boxes
bool logOutput = false; // true: Log Qt debug output to file
QString unitTestOptions;
CmdLineOpt_t rgCmdLineOptions[] = {
{ "--unittest", &runUnitTests, &unitTestOptions },
{ "--unittest-stress", &stressUnitTests, &unitTestOptions },
{ "--no-windows-assert-ui", &quietWindowsAsserts, NULL },
{ "--log-output", &logOutput, NULL },
// Add additional command line option flags here
};
......@@ -208,7 +206,7 @@ int main(int argc, char *argv[])
#endif
#endif // QT_DEBUG
QGCApplication* app = new QGCApplication(argc, argv, logOutput, runUnitTests);
QGCApplication* app = new QGCApplication(argc, argv, runUnitTests);
Q_CHECK_PTR(app);
#ifdef Q_OS_LINUX
......
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