From 8e83e1991d9e1223a130266c8fa3ac2ffcdf34e6 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 10 Apr 2018 19:29:26 -0700
Subject: [PATCH] Release build fixes

---
 src/QGCApplication.cc | 5 +++--
 src/QGCApplication.h  | 2 +-
 src/main.cc           | 4 +---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 281e00ef5..2494d5ba1 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -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
diff --git a/src/QGCApplication.h b/src/QGCApplication.h
index 1a41300c9..0c098f13f 100644
--- a/src/QGCApplication.h
+++ b/src/QGCApplication.h
@@ -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.
diff --git a/src/main.cc b/src/main.cc
index 02b8abd7e..8c2ff2ddc 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -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
-- 
2.22.0