From 2d1c5d47ee383f95015ee81144a20878ddcac7f8 Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 24 Nov 2015 15:36:53 +0000 Subject: [PATCH] Fix MSVC2012 build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - multi-line QStringLiteral doesn’t work on MSVC prior to 2013. Boo. --- src/GUI/PathsDialog.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GUI/PathsDialog.cxx b/src/GUI/PathsDialog.cxx index 9282de1e0..726932dea 100644 --- a/src/GUI/PathsDialog.cxx +++ b/src/GUI/PathsDialog.cxx @@ -154,14 +154,14 @@ void PathsDialog::onRemoveCatalog() FGHTTPClient* http = static_cast(globals->get_subsystem("http")); if (mi.isValid()) { - QString s = QStringLiteral("Remove aircraft hangar '%1'? All installed aircraft from this " - "hangar will be removed."); + QString s = QString("Remove aircraft hangar '%1'? All installed aircraft from this " + "hangar will be removed."); QString pkgId = mi.data(CatalogIdRole).toString(); if (pkgId.toStdString() == http->getDefaultCatalogId()) { - s = QStringLiteral("Remove default aircraft hangar? " - "This hangar contains all the default aircraft included with FlightGear. " - "If you change your mind in the future, click the 'restore' button."); + s = QString("Remove default aircraft hangar? " + "This hangar contains all the default aircraft included with FlightGear. " + "If you change your mind in the future, click the 'restore' button."); } else { s = s.arg(mi.data(Qt::DisplayRole).toString()); } -- 2.39.2