From d4cd82b52101507a0d3f862b41005d7331a96c25 Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 8 May 2018 22:17:07 +0100 Subject: [PATCH] Fixes for Qt 5.4 compat --- src/GUI/AddOnsController.cxx | 2 -- src/GUI/AddOnsController.hxx | 1 + src/GUI/CatalogListModel.hxx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/GUI/AddOnsController.cxx b/src/GUI/AddOnsController.cxx index 5033b4c3c..72dd76ad4 100644 --- a/src/GUI/AddOnsController.cxx +++ b/src/GUI/AddOnsController.cxx @@ -146,8 +146,6 @@ void AddOnsController::setAircraftPaths(QStringList aircraftPaths) if (m_aircraftPaths == aircraftPaths) return; - qInfo() << Q_FUNC_INFO << aircraftPaths << ", was " << m_aircraftPaths; - m_aircraftPaths = aircraftPaths; emit aircraftPathsChanged(m_aircraftPaths); diff --git a/src/GUI/AddOnsController.hxx b/src/GUI/AddOnsController.hxx index 2a9337726..1280cac11 100644 --- a/src/GUI/AddOnsController.hxx +++ b/src/GUI/AddOnsController.hxx @@ -2,6 +2,7 @@ #define ADDONSCONTROLLER_HXX #include +#include class CatalogListModel; class LauncherMainWindow; diff --git a/src/GUI/CatalogListModel.hxx b/src/GUI/CatalogListModel.hxx index 58792ad62..435cc3bfa 100644 --- a/src/GUI/CatalogListModel.hxx +++ b/src/GUI/CatalogListModel.hxx @@ -90,7 +90,7 @@ public: NoAddInProgress }; - Q_ENUM(CatalogStatus) + Q_ENUMS(CatalogStatus) void onCatalogStatusChanged(simgear::pkg::Catalog *cat);