fly/flightgear
1
0
Fork 0
Code Activity

Ensure we build on Qt 5.4 (no qInfo)

Browse source
This commit is contained in:
James Turner 2018-07-03 09:35:26 +01:00
parent 5c3c4a6733
commit abcbbe897f
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/GUI/LaunchConfig.cxx
View file

@ -71,7 +71,6 @@ void LaunchConfig::applyToOptions() const
if (arg.origin == Launcher) { if (arg.origin == Launcher) {
auto it = extraArgs.find(name); auto it = extraArgs.find(name);
if (it != extraArgs.end()) { if (it != extraArgs.end()) {
qInfo() << "skipping arg:" << arg.arg << "=" << arg.value << "because the user has over-ridden it";
return; return;
} }
} }
@ -87,6 +86,12 @@ std::set<std::string> LaunchConfig::extraArgNames() const
// don't override prop: arguments // don't override prop: arguments
if (arg.arg == "prop") continue; if (arg.arg == "prop") continue;
// allow some multi-valued arguments
if (arg.arg == "fg-scenery")
{
continue;
}
if (arg.origin == ExtraArgs) if (arg.origin == ExtraArgs)
r.insert(arg.arg.toStdString()); r.insert(arg.arg.toStdString());
} }

4
src/GUI/LauncherController.cxx
View file

@ -107,7 +107,6 @@ LauncherController::LauncherController(QObject *parent, QWindow* window) :
m_subsystemIdleTimer->start(); m_subsystemIdleTimer->start();
QRect winRect= settings.value("window-geometry").toRect(); QRect winRect= settings.value("window-geometry").toRect();
qInfo() << "read saved window geometry:" << winRect;
if (winRect.isValid()) { if (winRect.isValid()) {
m_window->setGeometry(winRect); m_window->setGeometry(winRect);
@ -117,7 +116,6 @@ LauncherController::LauncherController(QObject *parent, QWindow* window) :
} }
if (settings.contains("window-state")) { if (settings.contains("window-state")) {
qInfo() << "restoring window state";
const auto ws = static_cast<Qt::WindowState>(settings.value("window-state").toInt()); const auto ws = static_cast<Qt::WindowState>(settings.value("window-state").toInt());
m_window->setWindowState(ws); m_window->setWindowState(ws);
} }
@ -254,7 +252,9 @@ void LauncherController::collectAircraftArgs()
QString state = m_aircraftState; QString state = m_aircraftState;
if ((m_aircraftState == "auto") && !m_selectedAircraftInfo->haveExplicitAutoState()) { if ((m_aircraftState == "auto") && !m_selectedAircraftInfo->haveExplicitAutoState()) {
state = selectAircraftStateAutomatically(); state = selectAircraftStateAutomatically();
#if QT_VERSION >= 0x050600
qInfo() << "doing launcher auto state selection, picked:" + state; qInfo() << "doing launcher auto state selection, picked:" + state;
#endif
} }
if (!state.isEmpty()) { if (!state.isEmpty()) {

3
src/GUI/LocationController.cxx
View file

@ -501,7 +501,6 @@ void LocationController::setBaseLocation(QmlPositioned* pos)
m_airportLocation = static_cast<FGAirport*>(m_location.ptr()); m_airportLocation = static_cast<FGAirport*>(m_location.ptr());
// disable offset when selecting a heliport // disable offset when selecting a heliport
if (m_airportLocation->isHeliport()) { if (m_airportLocation->isHeliport()) {
qInfo() << "disabling offset";
m_onFinal = false; m_onFinal = false;
} }
} else { } else {
@ -1006,7 +1005,7 @@ void LocationController::applyAltitude()
void LocationController::onCollectConfig() void LocationController::onCollectConfig()
{ {
if (m_skipFromArgs) { if (m_skipFromArgs) {
qInfo() << Q_FUNC_INFO << "skipping argument collection"; qWarning() << Q_FUNC_INFO << "skipping argument collection";
return; return;
} }