From abcbbe897ff2c22651194f51c49aae1d3bead7df Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 3 Jul 2018 09:35:26 +0100
Subject: [PATCH] Ensure we build on Qt 5.4 (no qInfo)

---
 src/GUI/LaunchConfig.cxx       | 7 ++++++-
 src/GUI/LauncherController.cxx | 4 ++--
 src/GUI/LocationController.cxx | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/GUI/LaunchConfig.cxx b/src/GUI/LaunchConfig.cxx
index 182f48d65..3635e9505 100644
--- a/src/GUI/LaunchConfig.cxx
+++ b/src/GUI/LaunchConfig.cxx
@@ -71,7 +71,6 @@ void LaunchConfig::applyToOptions() const
         if (arg.origin == Launcher) {
             auto it = extraArgs.find(name);
             if (it != extraArgs.end()) {
-                qInfo() << "skipping arg:" << arg.arg << "=" << arg.value << "because the user has over-ridden it";
                 return;
             }
         }
@@ -87,6 +86,12 @@ std::set<std::string> LaunchConfig::extraArgNames() const
 		// don't override prop: arguments
 		if (arg.arg == "prop") continue;
 
+        // allow some multi-valued arguments
+        if (arg.arg == "fg-scenery")
+        {
+            continue;
+        }
+
 		if (arg.origin == ExtraArgs)
 			r.insert(arg.arg.toStdString());
 	}
diff --git a/src/GUI/LauncherController.cxx b/src/GUI/LauncherController.cxx
index 03b5f3c46..085683fa7 100644
--- a/src/GUI/LauncherController.cxx
+++ b/src/GUI/LauncherController.cxx
@@ -107,7 +107,6 @@ LauncherController::LauncherController(QObject *parent, QWindow* window) :
     m_subsystemIdleTimer->start();
 
     QRect winRect= settings.value("window-geometry").toRect();
-    qInfo() << "read saved window geometry:" << winRect;
 
     if (winRect.isValid()) {
         m_window->setGeometry(winRect);
@@ -117,7 +116,6 @@ LauncherController::LauncherController(QObject *parent, QWindow* window) :
     }
 
     if (settings.contains("window-state")) {
-        qInfo() << "restoring window state";
         const auto ws = static_cast<Qt::WindowState>(settings.value("window-state").toInt());
         m_window->setWindowState(ws);
     }
@@ -254,7 +252,9 @@ void LauncherController::collectAircraftArgs()
         QString state = m_aircraftState;
         if ((m_aircraftState == "auto") && !m_selectedAircraftInfo->haveExplicitAutoState()) {
             state = selectAircraftStateAutomatically();
+#if QT_VERSION >= 0x050600
             qInfo() << "doing launcher auto state selection, picked:" + state;
+#endif
         }
 
         if (!state.isEmpty()) {
diff --git a/src/GUI/LocationController.cxx b/src/GUI/LocationController.cxx
index 909e6d1ae..6665b1a90 100644
--- a/src/GUI/LocationController.cxx
+++ b/src/GUI/LocationController.cxx
@@ -501,7 +501,6 @@ void LocationController::setBaseLocation(QmlPositioned* pos)
         m_airportLocation = static_cast<FGAirport*>(m_location.ptr());
         // disable offset when selecting a heliport
         if (m_airportLocation->isHeliport()) {
-            qInfo() << "disabling offset";
             m_onFinal = false;
         }
     } else {
@@ -1006,7 +1005,7 @@ void LocationController::applyAltitude()
 void LocationController::onCollectConfig()
 {
     if (m_skipFromArgs) {
-        qInfo() << Q_FUNC_INFO << "skipping argument collection";
+        qWarning() << Q_FUNC_INFO << "skipping argument collection";
         return;
     }