diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 43ce530c0..e0596f405 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -286,75 +286,75 @@ namespace BlackCore
         QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const
         {
             QString s =
-                QStringLiteral("timestamp: ")
+                u"timestamp: "
                 % this->getFormattedUtcTimestampYmdhms()
                 % separator
-                % QStringLiteral("Global setup loaded: ")
+                % u"Global setup loaded: "
                 % boolToYesNo(this->wasLoadedFromWeb())
-                % QStringLiteral("/")
+                % u'/'
                 % boolToYesNo(this->wasLoadedFromFile())
                 % separator
 
-                % QStringLiteral("For development: ")
+                % u"For development: "
                 % boolToYesNo(isDevelopment())
                 % separator
 
-                % QStringLiteral("Mapping min.version: ")
+                % u"Mapping min.version: "
                 % this->getMappingMinimumVersionString()
                 % separator
 
-                % QStringLiteral("Distribution URLs: ")
+                % u"Distribution URLs: "
                 % getSwiftUpdateInfoFileUrls().toQString(i18n)
                 % separator
-                % QStringLiteral("Bootstrap URLs: ")
+                % u"Bootstrap URLs: "
                 % getSwiftBootstrapFileUrls().toQString(i18n)
                 % separator
-                % QStringLiteral("News URLs: ")
+                % u"News URLs: "
                 % getSwiftLatestNewsUrls().toQString(i18n)
                 % separator
-                % QStringLiteral("Help URLs: ")
+                % u"Help URLs: "
                 % m_onlineHelpUrls.toQString(i18n)
                 % separator
-                % QStringLiteral("swift map URLs: ")
+                % u"swift map URLs: "
                 % getSwiftMapUrls().toQString(i18n)
                 % separator;
             s +=
-                QStringLiteral("DB root directory: ")
+                u"DB root directory: "
                 % getDbRootDirectoryUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("ICAO DB reader: ")
+                % u"ICAO DB reader: "
                 % getDbIcaoReaderUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("Model DB reader: ")
+                % u"Model DB reader: "
                 % getDbModelReaderUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("Airport DB reader: ")
+                % u"Airport DB reader: "
                 % getDbAirportReaderUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("DB home page: ")
+                % u"DB home page: "
                 % getDbHomePageUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("DB login service: ")
+                % u"DB login service: "
                 % getDbLoginServiceUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("DB client ping service: ")
+                % u"DB client ping service: "
                 % getDbClientPingServiceUrl().toQString(i18n);
             s +=
-                QStringLiteral("VATSIM bookings: ")
+                u"VATSIM bookings: "
                 % getVatsimBookingsUrl().toQString(i18n)
                 % separator
-                % QStringLiteral("VATSIM METARs: ")
+                % u"VATSIM METARs: "
                 % getVatsimMetarsUrls().toQString(i18n)
                 % separator
-                % QStringLiteral("VATSIM data file: ")
+                % u"VATSIM data file: "
                 % getVatsimDataFileUrls().toQString(i18n)
                 % separator
 
-                % QStringLiteral("Predefined servers: ")
+                % u"Predefined servers: "
                 % getPredefinedServers().toQString(i18n)
                 % separator
 
-                % QStringLiteral("Crash report server: ")
+                % u"Crash report server: "
                 % getCrashReportServerUrl().toQString(i18n);
 
             return s;
diff --git a/src/blackgui/components/aircraftpartshistory.cpp b/src/blackgui/components/aircraftpartshistory.cpp
index 0a4b93c07..5ce6458eb 100644
--- a/src/blackgui/components/aircraftpartshistory.cpp
+++ b/src/blackgui/components/aircraftpartshistory.cpp
@@ -95,36 +95,36 @@ namespace BlackGui
             QString html;
             if (currentAircraftParts == CAircraftParts() && aircraftPartsHistory.isEmpty())
             {
-                html = cs.toQString() % QLatin1String(" does not support aircraft parts or nothing received yet.");
+                html = cs.toQString() % u" does not support aircraft parts or nothing received yet.";
             }
             else
             {
                 const QString s =
-                    QLatin1String("lights on:") %
-                    QLatin1String("<br>") %
-                    QLatin1String("&nbsp;&nbsp;&nbsp;&nbsp;") %
+                    u"lights on:"
+                    u"<br>"
+                    u"&nbsp;&nbsp;&nbsp;&nbsp;" %
                     currentAircraftParts.getLights().toQString() %
-                    QLatin1String("<br>") %
-                    QLatin1String("gear down: ") %
+                    u"<br>"
+                    u"gear down: " %
                     BlackMisc::boolToYesNo(currentAircraftParts.isGearDown()) %
-                    QLatin1String("<br>") %
-                    QLatin1String("flaps pct: ") %
+                    u"<br>"
+                    u"flaps pct: " %
                     QString::number(currentAircraftParts.getFlapsPercent()) %
-                    QLatin1String("<br>") %
-                    QLatin1String("spoilers out: ") %
+                    u"<br>"
+                    u"spoilers out: " %
                     BlackMisc::boolToYesNo(currentAircraftParts.isSpoilersOut()) %
-                    QLatin1String("<br>") %
-                    QLatin1String("engines on: ") %
-                    QLatin1String("<br>") %
-                    QLatin1String("&nbsp;&nbsp;&nbsp;&nbsp;") %
+                    u"<br>"
+                    u"engines on: "
+                    u"<br>"
+                    u"&nbsp;&nbsp;&nbsp;&nbsp;" %
                     currentAircraftParts.getEngines().toQString() %
-                    QLatin1String("<br>") %
-                    QLatin1String(" on ground: ") %
+                    u"<br>"
+                    u" on ground: " %
                     BlackMisc::boolToYesNo(currentAircraftParts.isOnGround());
                 html += s;
                 if (ui->cb_PartsHistoryEnabled->isChecked())
                 {
-                    html += QLatin1String("<hr>") %
+                    html += u"<hr>" %
                             aircraftPartsHistory.toHtml(CStatusMessageList::timestampHtmlOutput());
                 }
             }