diff --git a/samples/blackmisc/samplesperformance.cpp b/samples/blackmisc/samplesperformance.cpp
index 4ce0e998e..b157a79ca 100644
--- a/samples/blackmisc/samplesperformance.cpp
+++ b/samples/blackmisc/samplesperformance.cpp
@@ -38,7 +38,7 @@
 #include <QStringList>
 #include <QStringBuilder>
 #include <QTextStream>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QVector>
 #include <Qt>
 #include <algorithm>
@@ -58,7 +58,7 @@ namespace BlackSample
 {
     int CSamplesPerformance::samplesMisc(QTextStream &out)
     {
-        QTime timer;
+        QElapsedTimer timer;
         int ms, number;
         CSamplesPerformance::copy10kStations(1); // init
 
@@ -194,7 +194,7 @@ namespace BlackSample
 
         qint64 halfTime = baseTimeEpoch + DeltaTime * numberOfTimes / 2;
 
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         for (int cs = 0; cs < numberOfCallsigns; cs++)
         {
@@ -245,7 +245,7 @@ namespace BlackSample
 
     int CSamplesPerformance::samplesJson(QTextStream &out)
     {
-        QTime timer;
+        QElapsedTimer timer;
         auto situations = createSituations(0, 10000, 10);
         auto models = createModels(10000, 100);
 
@@ -297,7 +297,7 @@ namespace BlackSample
 
         // DB format, all models denormalized in DB JSON format
         CDatabaseReader::JsonDatastoreResponse response;
-        QTime timer;
+        QElapsedTimer timer;
 
         CDatabaseReader::stringToDatastoreResponse(liveryData, response);
         timer.start();
@@ -345,7 +345,7 @@ namespace BlackSample
 
     int CSamplesPerformance::samplesStringUtilsVsRegEx(QTextStream &out)
     {
-        QTime timer;
+        QElapsedTimer timer;
         static const QString chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~_-=+!\"@#$%^&*()[]{} \t;:\\/?,.<>";
         QStringList strings;
         std::generate_n(std::back_inserter(strings), 100000, []
@@ -438,7 +438,7 @@ namespace BlackSample
         const QString x8 = "88-1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
         const QString x9 = "99-1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-        QTime time;
+        QElapsedTimer time;
         time.start();
         for (int i = 0; i < loop; i++)
         {
@@ -510,7 +510,7 @@ namespace BlackSample
     int CSamplesPerformance::samplesStringLiteralVsConstQString(QTextStream &out)
     {
         const int loop = 1e7;
-        QTime time;
+        QElapsedTimer time;
         QString x;
         time.start();
         for (int i = 0; i < loop; i++)
@@ -597,7 +597,7 @@ namespace BlackSample
         Q_ASSERT(cs_25_100_rnd.size() == 100);
         Q_ASSERT(cs_50_100_rnd.size() == 100);
 
-        QTime time;
+        QElapsedTimer time;
         time.start();
         for (int i = 1; i < 10000; ++i)
         {
diff --git a/samples/blackmiscsim/main.cpp b/samples/blackmiscsim/main.cpp
index 4a109df5d..a0befc33d 100644
--- a/samples/blackmiscsim/main.cpp
+++ b/samples/blackmiscsim/main.cpp
@@ -23,7 +23,7 @@
 #include <QCoreApplication>
 #include <QString>
 #include <QTextStream>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QtGlobal>
 
 using namespace BlackMisc;
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
     QTextStream streamOut(stdout);
 
     bool run = true;
-    QTime t;
+    QElapsedTimer t;
     while (run)
     {
         streamOut << "Run samples:" << endl;
diff --git a/samples/blackmiscsim/samplesfscommon.cpp b/samples/blackmiscsim/samplesfscommon.cpp
index 13bbc21b8..badf104d2 100644
--- a/samples/blackmiscsim/samplesfscommon.cpp
+++ b/samples/blackmiscsim/samplesfscommon.cpp
@@ -21,7 +21,7 @@
 #include <QString>
 #include <QTemporaryFile>
 #include <QTextStream>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QDir>
 #include <QtGlobal>
 
@@ -60,7 +60,7 @@ namespace BlackSample
         Q_UNUSED(input);
 
         streamOut << "reading directly" << endl;
-        QTime time;
+        QElapsedTimer time;
         time.start();
         streamOut << "reading " << parser.getFirstModelDirectoryOrDefault() << endl;
         parser.startLoading();
diff --git a/samples/blackmiscsim/samplesp3d.cpp b/samples/blackmiscsim/samplesp3d.cpp
index dbecbdc7d..bfa45855f 100644
--- a/samples/blackmiscsim/samplesp3d.cpp
+++ b/samples/blackmiscsim/samplesp3d.cpp
@@ -23,7 +23,7 @@ namespace BlackSample
         const QSet<QString> configFiles = CFsCommonUtil::findP3dAddOnConfigFiles("v4");
         streamOut << BlackMisc::joinStringSet(configFiles, ", ") << endl;
 
-        const QSet<QString> addOnPaths = CFsCommonUtil::allConfigFilesPathValues(configFiles.toList(), false, {});
+        const QSet<QString> addOnPaths = CFsCommonUtil::allConfigFilesPathValues(configFiles.values(), false, {});
         streamOut << BlackMisc::joinStringSet(addOnPaths, ", ") << endl;
 
         const QSet<QString> simObjectPaths = CFsCommonUtil::fsxSimObjectsPaths("B:/fsx.cfg", false);
diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp
index ef06ec230..f35772d82 100644
--- a/src/blackconfig/buildconfig.cpp
+++ b/src/blackconfig/buildconfig.cpp
@@ -20,6 +20,7 @@
 #include <QStringBuilder>
 #include <QtGlobal>
 #include <QSysInfo>
+#include <QOperatingSystemVersion>
 
 namespace BlackConfig
 {
@@ -50,13 +51,8 @@ namespace BlackConfig
 
     bool CBuildConfig::isRunningOnWindows10()
     {
-#ifdef Q_OS_WIN
-        // QSysInfo::WindowsVersion only available on Win platforms
         if (!CBuildConfig::isRunningOnWindowsNtPlatform()) { return false; }
-        return (QSysInfo::WindowsVersion == QSysInfo::WV_10_0);
-#else
-        return false;
-#endif
+        return (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10);
     }
 
     const QString &CBuildConfig::getPlatformString()
@@ -186,7 +182,7 @@ namespace BlackConfig
         {
             // Mar 27 2017 20:17:06 (needs to be on english locale, otherwise fails - e.g.
             QDateTime dt = QLocale(QLocale::English).toDateTime(CBuildConfig::buildDateAndTime().simplified(), "MMM d yyyy hh:mm:ss");
-            dt.setUtcOffset(0);
+            dt.setOffsetFromUtc(0);
             return dt;
         }
     }
diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp
index 374522192..cfb813175 100644
--- a/src/blackcore/afv/clients/afvclient.cpp
+++ b/src/blackcore/afv/clients/afvclient.cpp
@@ -746,7 +746,7 @@ namespace BlackCore
                         dto.sequenceCounter = args.sequenceCounter;
                         dto.audio = std::vector<char>(args.audio.begin(), args.audio.end());
                         dto.lastPacket = false;
-                        dto.transceivers = transmittingTransceivers.toStdVector();
+                        dto.transceivers = std::vector<TxTransceiverDto>(transmittingTransceivers.begin(), transmittingTransceivers.end());
                         QMutexLocker lock(&m_mutexConnection);
                         m_connection->sendToVoiceServer(dto);
                     }
@@ -758,7 +758,7 @@ namespace BlackCore
                         dto.sequenceCounter = args.sequenceCounter;
                         dto.audio = std::vector<char>(args.audio.begin(), args.audio.end());
                         dto.lastPacket = true;
-                        dto.transceivers = transmittingTransceivers.toStdVector();
+                        dto.transceivers = std::vector<TxTransceiverDto>(transmittingTransceivers.begin(), transmittingTransceivers.end());
                         QMutexLocker lock(&m_mutexConnection);
                         m_connection->sendToVoiceServer(dto);
                     }
@@ -775,7 +775,7 @@ namespace BlackCore
                 audioData.sequenceCounter = dto.sequenceCounter;
 
                 QMutexLocker lock(&m_mutex);
-                m_soundcardSampleProvider->addOpusSamples(audioData, QVector<RxTransceiverDto>::fromStdVector(dto.transceivers));
+                m_soundcardSampleProvider->addOpusSamples(audioData, QVector<RxTransceiverDto>(dto.transceivers.begin(), dto.transceivers.end()));
             }
 
             void CAfvClient::inputVolumeStream(const InputVolumeStreamArgs &args)
diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index d19cd540d..554bf5b02 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -1203,7 +1203,7 @@ namespace BlackCore
         }
 
         const QSet<QString> allIcaos = aircraft.allDesignators();
-        const QString allIcaosStr = allIcaos.toList().join(", ");
+        const QString allIcaosStr = allIcaos.values().join(", ");
         CLogUtilities::addLogDetailsToList(log, callsign, QStringLiteral("Aircraft '%1' known for airline '%2'").arg(allIcaosStr, airline.getDesignator()));
 
         const CAircraftIcaoCode code = aircraft.findBestFuzzyMatchOrDefault(candidateString);
diff --git a/src/blackcore/corefacade.cpp b/src/blackcore/corefacade.cpp
index eed35c04d..4dec9f9e7 100644
--- a/src/blackcore/corefacade.cpp
+++ b/src/blackcore/corefacade.cpp
@@ -39,7 +39,7 @@
 #include <QObject>
 #include <QStringBuilder>
 #include <QString>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QtGlobal>
 
 using namespace BlackMisc;
@@ -82,7 +82,7 @@ namespace BlackCore
         if (m_initalized || m_shuttingDown) { return; }
 
         QMap<QString, int> times;
-        QTime time;
+        QElapsedTimer time;
         CCoreFacade::registerMetadata();
 
         // either use explicit setting or last value
@@ -178,7 +178,7 @@ namespace BlackCore
     {
         bool c = false;
         Q_UNUSED(c) // for release version
-        QTime time;
+        QElapsedTimer time;
         time.start();
 
         times.insert("Post setup, connects first", time.restart());
diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp
index cbf721aef..33faadfc3 100644
--- a/src/blackcore/db/airportdatareader.cpp
+++ b/src/blackcore/db/airportdatareader.cpp
@@ -14,6 +14,7 @@
 
 #include <QStringBuilder>
 #include <QNetworkReply>
+#include <QElapsedTimer>
 #include <QFileInfo>
 #include <QPointer>
 
@@ -106,7 +107,7 @@ namespace BlackCore
                     {
                         const CAirportList airports = CAirportList::fromMultipleJsonFormats(airportsJson);
                         c = airports.size();
-                        msgs.push_back(m_airportCache.set(airports, fi.created().toUTC().toMSecsSinceEpoch()));
+                        msgs.push_back(m_airportCache.set(airports, fi.birthTime().toUTC().toMSecsSinceEpoch()));
 
                         emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFinished, c);
                         reallyRead |= CEntityFlags::AirportEntity;
@@ -211,7 +212,7 @@ namespace BlackCore
             }
             else
             {
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 airports = CAirportList::fromDatabaseJson(res, &inconsistent);
                 this->logParseMessage("airports", airports.size(), time.elapsed(), res);
diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp
index 2b1e10af1..7a14c49c9 100644
--- a/src/blackcore/db/backgrounddataupdater.cpp
+++ b/src/blackcore/db/backgrounddataupdater.cpp
@@ -15,7 +15,7 @@
 #include "blackmisc/threadutils.h"
 #include "blackmisc/eventloop.h"
 #include "blackmisc/logmessage.h"
-#include <QTime>
+#include <QElapsedTimer>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
@@ -125,7 +125,7 @@ namespace BlackCore
                                                 dbModelsConsidered;
             if (dbModels.isEmpty()) { return; }
             const QSet<CSimulatorInfo> simulatorsSet = simulators.asSingleSimulatorSet();
-            QTime time;
+            QElapsedTimer time;
             for (const CSimulatorInfo &singleSimulator : simulatorsSet)
             {
                 if (!this->doWorkCheck()) { return; }
diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp
index a09b6365a..e81ad865c 100644
--- a/src/blackcore/db/databasereader.cpp
+++ b/src/blackcore/db/databasereader.cpp
@@ -650,10 +650,10 @@ namespace BlackCore
 
         bool CDatabaseReader::overrideCacheFromFile(bool overrideNewerOnly, const QFileInfo &fileInfo, CEntityFlags::Entity entity, CStatusMessageList &msgs) const
         {
-            if (!fileInfo.created().isValid()) { return false; }
+            if (!fileInfo.birthTime().isValid()) { return false; }
             if (!overrideNewerOnly) { return true; }
 
-            const qint64 fileTs = fileInfo.created().toUTC().toMSecsSinceEpoch();
+            const qint64 fileTs = fileInfo.birthTime().toUTC().toMSecsSinceEpoch();
             const QDateTime cacheDateTime(this->getCacheTimestamp(entity));
             if (!cacheDateTime.isValid()) { return true; } // no cache
             const qint64 cacheTs = cacheDateTime.toUTC().toMSecsSinceEpoch();
diff --git a/src/blackcore/db/databaseutils.cpp b/src/blackcore/db/databaseutils.cpp
index 0b8de9978..b3ef08393 100644
--- a/src/blackcore/db/databaseutils.cpp
+++ b/src/blackcore/db/databaseutils.cpp
@@ -12,6 +12,7 @@
 #include "blackmisc/logmessage.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/compressutils.h"
+#include <QElapsedTimer>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Json;
@@ -162,7 +163,7 @@ namespace BlackCore
         {
             if (models.isEmpty() || simulatorModels.isEmpty()) { return models; }
 
-            QTime timer;
+            QElapsedTimer timer;
             timer.start();
             const QSet<QString> allOwnModelsModelStrings = simulatorModels.getModelStringSet();
             CAircraftModelList consolidatedModels;
@@ -204,7 +205,7 @@ namespace BlackCore
         {
             if (models.isEmpty() || simulatorModels.isEmpty()) { return models; }
 
-            QTime timer;
+            QElapsedTimer timer;
             timer.start();
             const QSet<QString> allOwnModelsModelStrings = simulatorModels.getModelStringSet();
             CAircraftModelList consolidatedModels;
@@ -252,7 +253,7 @@ namespace BlackCore
 
         int CDatabaseUtils::consolidateModelsWithDbDataAllowsGuiRefresh(CAircraftModelList &models, bool force, bool processEvents)
         {
-            QTime timer;
+            QElapsedTimer timer;
             timer.start();
             int c = 0;
             if (models.isEmpty()) { return c; }
@@ -275,7 +276,7 @@ namespace BlackCore
         {
             if (dbModels.isEmpty() || simulatorModels.isEmpty()) { return 0; }
 
-            QTime timer;
+            QElapsedTimer timer;
             timer.start();
             const QSet<QString> dbModelsModelStrings = dbModels.getModelStringSet();
 
diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp
index ace102545..51764b2c1 100644
--- a/src/blackcore/db/icaodatareader.cpp
+++ b/src/blackcore/db/icaodatareader.cpp
@@ -17,6 +17,7 @@
 #include "blackmisc/statusmessage.h"
 
 #include <QStringBuilder>
+#include <QElapsedTimer>
 #include <QDateTime>
 #include <QDir>
 #include <QFlags>
@@ -316,7 +317,7 @@ namespace BlackCore
             else
             {
                 // normally read from special DB view which already filters incomplete
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 codes  = CAircraftIcaoCodeList::fromDatabaseJson(res, categories, true, &inconsistent);
                 this->logParseMessage("aircraft ICAO", codes.size(), time.elapsed(), res);
@@ -371,7 +372,7 @@ namespace BlackCore
             else
             {
                 // normally read from special DB view which already filters incomplete
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 codes = CAirlineIcaoCodeList::fromDatabaseJson(res, true, &inconsistent);
                 this->logParseMessage("airline ICAO", codes.size(), time.elapsed(), res);
@@ -423,7 +424,7 @@ namespace BlackCore
             else
             {
                 // normally read from special DB view which already filters incomplete
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 countries = CCountryList::fromDatabaseJson(res);
                 this->logParseMessage("countries", countries.size(), time.elapsed(), res);
@@ -468,7 +469,7 @@ namespace BlackCore
             else
             {
                 // normally read from special DB view which already filters incomplete
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 categories  = CAircraftCategoryList::fromDatabaseJson(res);
                 this->logParseMessage("categories", categories.size(), time.elapsed(), res);
@@ -526,7 +527,7 @@ namespace BlackCore
                         {
                             const CCountryList countries = CCountryList::fromMultipleJsonFormats(countriesJson);
                             const int c = countries.size();
-                            msgs.push_back(m_countryCache.set(countries, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_countryCache.set(countries, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             reallyRead |= CEntityFlags::CountryEntity;
                             emit this->dataRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFinished, c);
                         }
@@ -564,7 +565,7 @@ namespace BlackCore
                         {
                             const CAircraftIcaoCodeList aircraftIcaos = CAircraftIcaoCodeList::fromMultipleJsonFormats(aircraftJson);
                             const int c = aircraftIcaos.size();
-                            msgs.push_back(m_aircraftIcaoCache.set(aircraftIcaos, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_aircraftIcaoCache.set(aircraftIcaos, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             reallyRead |= CEntityFlags::AircraftIcaoEntity;
                             emit this->dataRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, c);
                         }
@@ -602,7 +603,7 @@ namespace BlackCore
                         {
                             const CAirlineIcaoCodeList airlineIcaos = CAirlineIcaoCodeList::fromMultipleJsonFormats(airlineJson);
                             const int c = airlineIcaos.size();
-                            msgs.push_back(m_airlineIcaoCache.set(airlineIcaos, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_airlineIcaoCache.set(airlineIcaos, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             reallyRead |= CEntityFlags::AirlineIcaoEntity;
                             emit this->dataRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c);
                         }
@@ -640,7 +641,7 @@ namespace BlackCore
                         {
                             const CAircraftCategoryList aircraftCategories = CAircraftCategoryList::fromMultipleJsonFormats(aircraftCategory);
                             const int c = aircraftCategories.size();
-                            msgs.push_back(m_categoryCache.set(aircraftCategories, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_categoryCache.set(aircraftCategories, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             reallyRead |= CEntityFlags::AircraftCategoryEntity;
                             emit this->dataRead(CEntityFlags::AircraftCategoryEntity, CEntityFlags::ReadFinished, c);
                         }
diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp
index 168d57606..1dde3082b 100644
--- a/src/blackcore/db/modeldatareader.cpp
+++ b/src/blackcore/db/modeldatareader.cpp
@@ -24,7 +24,7 @@
 #include <QScopedPointer>
 #include <QScopedPointerDeleteLater>
 #include <QTimer>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QPointer>
 #include <QUrl>
 #include <QWriteLocker>
@@ -318,7 +318,7 @@ namespace BlackCore
             }
             else
             {
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 liveries  = CLiveryList::fromDatabaseJson(res);
                 this->logParseMessage("liveries", liveries.size(), time.elapsed(), res);
@@ -366,7 +366,7 @@ namespace BlackCore
             }
             else
             {
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 distributors = CDistributorList::fromDatabaseJson(res);
                 this->logParseMessage("distributors", distributors.size(), time.elapsed(), res);
@@ -424,7 +424,7 @@ namespace BlackCore
             }
             else
             {
-                QTime time;
+                QElapsedTimer time;
                 time.start();
                 models = CAircraftModelList::fromDatabaseJsonCaching(res, icaos, categories, liveries, distributors);
                 this->logParseMessage("models", models.size(), time.elapsed(), res);
@@ -483,7 +483,7 @@ namespace BlackCore
                         {
                             const CLiveryList liveries = CLiveryList::fromMultipleJsonFormats(liveriesJson);
                             const int c = liveries.size();
-                            msgs.push_back(m_liveryCache.set(liveries, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_liveryCache.set(liveries, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             emit this->dataRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, c);
                             reallyRead |= CEntityFlags::LiveryEntity;
                         }
@@ -521,7 +521,7 @@ namespace BlackCore
                         {
                             const CAircraftModelList models = CAircraftModelList::fromMultipleJsonFormats(modelsJson);
                             const int c = models.size();
-                            msgs.push_back(m_modelCache.set(models, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_modelCache.set(models, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             emit this->dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFinished, c);
                             reallyRead |= CEntityFlags::ModelEntity;
                         }
@@ -559,7 +559,7 @@ namespace BlackCore
                         {
                             const CDistributorList distributors = CDistributorList::fromMultipleJsonFormats(distributorsJson);
                             const int c = distributors.size();
-                            msgs.push_back(m_distributorCache.set(distributors, fi.created().toUTC().toMSecsSinceEpoch()));
+                            msgs.push_back(m_distributorCache.set(distributors, fi.birthTime().toUTC().toMSecsSinceEpoch()));
                             emit this->dataRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, c);
                             reallyRead |= CEntityFlags::DistributorEntity;
                         }
diff --git a/src/blackgui/components/copyconfigurationcomponent.cpp b/src/blackgui/components/copyconfigurationcomponent.cpp
index dd94e5b1e..7069ca3f8 100644
--- a/src/blackgui/components/copyconfigurationcomponent.cpp
+++ b/src/blackgui/components/copyconfigurationcomponent.cpp
@@ -156,8 +156,8 @@ namespace BlackGui
             const QFileSystemModel *sourceModel = qobject_cast<QFileSystemModel *>(ui->tv_Source->model());
             if (!sourceModel) { return; }
 
-            QStringList select = comp.missingInTarget.toList();
-            select.append(comp.newerInSource.toList());
+            QStringList select = comp.missingInTarget.values();
+            select.append(comp.newerInSource.values());
             for (const QString &file : as_const(comp.missingInTarget))
             {
                 const QModelIndex index = sourceModel->index(file);
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index 64fc509b9..602aeb151 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -1068,7 +1068,7 @@ namespace BlackGui
         void CFlightPlanComponent::initCompleters()
         {
             if (!sGui || !sGui->hasWebDataServices()) { return; }
-            const QStringList aircraft(sGui->getWebDataServices()->getAircraftIcaoCodes().allDesignators().toList());
+            const QStringList aircraft(sGui->getWebDataServices()->getAircraftIcaoCodes().allDesignators().values());
             QCompleter *aircraftCompleter = new QCompleter(aircraft, this);
             aircraftCompleter->setMaxVisibleItems(10);
             aircraftCompleter->popup()->setMinimumWidth(75);
diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/blackgui/filters/aircrafticaofilterbar.cpp
index 66d201237..4a32f15eb 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.cpp
+++ b/src/blackgui/filters/aircrafticaofilterbar.cpp
@@ -128,11 +128,11 @@ namespace BlackGui
             if (sGui->getWebDataServices()->getAircraftIcaoCodesCount() < 1) { return; }
             m_hasCompleters = true;
             const CAircraftIcaoCodeList codes = sGui->getWebDataServices()->getAircraftIcaoCodes();
-            const QStringList designators = codes.allDesignators().toList();
+            const QStringList designators = codes.allDesignators().values();
             ui->le_Designator->setCompleter(new QCompleter(designators, ui->le_Designator));
-            const QStringList families = codes.allFamilies().toList();
+            const QStringList families = codes.allFamilies().values();
             ui->le_Family->setCompleter(new QCompleter(families, ui->le_Family));
-            const QStringList manufacturers = codes.allManufacturers().toList();
+            const QStringList manufacturers = codes.allManufacturers().values();
             ui->le_Manufacturer->setCompleter(new QCompleter(manufacturers, ui->le_Manufacturer));
         }
     } // ns
diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp
index 5a6535e48..6fae3ad13 100644
--- a/src/blackgui/guiutility.cpp
+++ b/src/blackgui/guiutility.cpp
@@ -829,7 +829,7 @@ namespace BlackGui
         label->setToolTip(longText);
         const QFontMetrics metrics(label->font());
         const int width = qMax(label->width() - 2, 0);
-        const int wl = metrics.width(longText);
+        const int wl = metrics.horizontalAdvance(longText);
         if (wl >= width) { label->setText(longText); return; }
         if (qRound(wl * 0.85) > wl)
         {
diff --git a/src/blackgui/levelmeter.h b/src/blackgui/levelmeter.h
index 9338428aa..adb54e899 100644
--- a/src/blackgui/levelmeter.h
+++ b/src/blackgui/levelmeter.h
@@ -17,7 +17,7 @@
 
 #include <QColor>
 #include <QObject>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QFrame>
 
 class QPaintEvent;
@@ -76,7 +76,7 @@ namespace BlackGui
         double m_peakLevel = 0.0;
 
         //! Time at which m_peakLevel was last changed.
-        QTime m_peakLevelChanged;
+        QElapsedTimer m_peakLevelChanged;
 
         static constexpr double High       = 0.60;
         static constexpr double DecayValue = 0.10;
diff --git a/src/blackmisc/aviation/aircraftcategorylist.cpp b/src/blackmisc/aviation/aircraftcategorylist.cpp
index 1478dc597..0f25581da 100644
--- a/src/blackmisc/aviation/aircraftcategorylist.cpp
+++ b/src/blackmisc/aviation/aircraftcategorylist.cpp
@@ -61,7 +61,7 @@ namespace BlackMisc
         {
             const QSet<QString> levels = this->getLevelStrings();
             if (levels.isEmpty()) {return {}; }
-            return levels.toList().join(separator);
+            return levels.values().join(separator);
         }
 
         QList<int> CAircraftCategoryList::getFirstLevels() const
@@ -72,7 +72,7 @@ namespace BlackMisc
                 levels.insert(category.getFirstLevel());
             }
             levels.remove(0);
-            QList<int> ll = levels.toList();
+            QList<int> ll = levels.values();
             std::sort(ll.begin(), ll.end());
             return ll;
         }
@@ -85,7 +85,7 @@ namespace BlackMisc
                 levels.insert(category.getSecondLevel());
             }
             levels.remove(0);
-            QList<int> ll = levels.toList();
+            QList<int> ll = levels.values();
             std::sort(ll.begin(), ll.end());
             return ll;
         }
diff --git a/src/blackmisc/aviation/airportlist.cpp b/src/blackmisc/aviation/airportlist.cpp
index 6c4fe5f27..c83482895 100644
--- a/src/blackmisc/aviation/airportlist.cpp
+++ b/src/blackmisc/aviation/airportlist.cpp
@@ -110,7 +110,7 @@ namespace BlackMisc
                 locations.insert(airport.getLocation());
             }
 
-            QStringList locs = locations.toList();
+            QStringList locs = locations.values();
             if (sorted) { locs.sort(); }
             return locs;
         }
diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp
index 245b42028..71d1c5f1c 100644
--- a/src/blackmisc/aviation/flightplan.cpp
+++ b/src/blackmisc/aviation/flightplan.cpp
@@ -906,9 +906,9 @@ namespace BlackMisc
         {
             static const QStringList e = []
             {
-                QSet<QString> el(CFlightPlan::faaEquipmentCodes().toSet());
-                el.unite(CFlightPlan::squawkBoxEquipmentCodes().toSet());
-                return el.toList();
+                QSet<QString> el(CFlightPlan::faaEquipmentCodes().begin(), CFlightPlan::faaEquipmentCodes().end());
+                el.unite(QSet<QString>(CFlightPlan::squawkBoxEquipmentCodes().begin(), CFlightPlan::squawkBoxEquipmentCodes().end()));
+                return el.values();
             }();
             return e;
         }
diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp
index b98ce7732..238e94cc6 100644
--- a/src/blackmisc/datacache.cpp
+++ b/src/blackmisc/datacache.cpp
@@ -420,7 +420,7 @@ namespace BlackMisc
                 auto deferrals = fromJson(json.value("deferrals").toArray());
                 m_admittedValues.unite(m_admittedQueue);
                 if (updateUuid) { m_admittedQueue.clear(); }
-                else if (! m_admittedQueue.isEmpty()) { m_admittedQueue.intersect(QSet<QString>::fromList(m_timestamps.keys())); }
+                else if (! m_admittedQueue.isEmpty()) { m_admittedQueue.intersect(QSet<QString>(m_timestamps.keyBegin(), m_timestamps.keyEnd())); }
 
                 for (const auto &key : m_timestamps.keys()) // clazy:exclude=container-anti-pattern,range-loop
                 {
@@ -548,7 +548,7 @@ namespace BlackMisc
         QMutexLocker lock(&m_mutex);
 
         Q_ASSERT(m_updateInProgress);
-        return QSet<QString>::fromList(m_timestamps.keys());
+        return QSet<QString>(m_timestamps.keyBegin(), m_timestamps.keyEnd());
     }
 
     const QMap<QString, qint64> &CDataCacheRevision::newerTimestamps() const
diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp
index 9ba465915..7f6bdf725 100644
--- a/src/blackmisc/fileutils.cpp
+++ b/src/blackmisc/fileutils.cpp
@@ -407,7 +407,7 @@ namespace BlackMisc
 
         auto it = std::max_element(files.cbegin(), files.cend(), [](const QFileInfo & a, const QFileInfo & b)
         {
-            return a.created() < b.created();
+            return a.birthTime() < b.birthTime();
         });
         return *it;
     }
diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp
index 52925c918..15ad30783 100644
--- a/src/blackmisc/logpattern.cpp
+++ b/src/blackmisc/logpattern.cpp
@@ -101,14 +101,16 @@ namespace BlackMisc
     {
         if (categories.size() == 0) { return empty(); }
         if (categories.size() == 1) { return exactMatch(categories[0]); }
-        return { AnyOf, QSet<QString>::fromList(categories.toQStringList()) };
+        const QStringList strList = categories.toQStringList();
+        return { AnyOf, QSet<QString>(strList.begin(), strList.end()) };
     }
 
     CLogPattern CLogPattern::allOf(const CLogCategoryList &categories)
     {
         if (categories.size() == 0) { return {}; }
         if (categories.size() == 1) { return exactMatch(categories[0]); }
-        return { AllOf, QSet<QString>::fromList(categories.toQStringList()) };
+        const QStringList strList = categories.toQStringList();
+        return { AnyOf, QSet<QString>(strList.begin(), strList.end()) };
     }
 
     CLogPattern CLogPattern::startsWith(const QString &prefix)
@@ -321,7 +323,7 @@ namespace BlackMisc
     {
         Q_UNUSED(i18n);
         QString strategy;
-        QString categories = QStringList(m_strings.toList()).join("|"); // clazy:exclude=container-anti-pattern
+        QString categories = m_strings.values().join("|"); // clazy:exclude=container-anti-pattern
         switch (m_strategy)
         {
         case Everything: strategy = "none"; break;
@@ -343,7 +345,7 @@ namespace BlackMisc
         quint8 severities = 0;
         for (auto s : m_severities) { severities |= (1 << static_cast<int>(s)); }
 
-        argument << severities << m_strategy << m_strings.toList();
+        argument << severities << m_strategy << m_strings.values();
     }
 
     void CLogPattern::unmarshallFromDbus(const QDBusArgument &argument)
@@ -351,7 +353,7 @@ namespace BlackMisc
         quint8 severities;
         QStringList strings;
         argument >> severities >> m_strategy >> strings;
-        m_strings = strings.toSet();
+        m_strings = QSet<QString>(strings.begin(), strings.end());
 
         m_severities.clear();
         for (int s : { 0, 1, 2, 3 })
@@ -365,7 +367,7 @@ namespace BlackMisc
         quint8 severities = 0;
         for (auto s : m_severities) { severities |= (1 << static_cast<int>(s)); }
 
-        stream << severities << m_strategy << m_strings.toList();
+        stream << severities << m_strategy << m_strings.values();
     }
 
     void CLogPattern::unmarshalFromDataStream(QDataStream &stream)
@@ -373,7 +375,7 @@ namespace BlackMisc
         quint8 severities;
         QStringList strings;
         stream >> severities >> m_strategy >> strings;
-        m_strings = strings.toSet();
+        m_strings = QSet<QString>(strings.begin(), strings.end());
 
         m_severities.clear();
         for (int s : { 0, 1, 2, 3 })
diff --git a/src/blackmisc/network/external/qjsonwebtoken.cpp b/src/blackmisc/network/external/qjsonwebtoken.cpp
index 718a19efb..29ae0682a 100644
--- a/src/blackmisc/network/external/qjsonwebtoken.cpp
+++ b/src/blackmisc/network/external/qjsonwebtoken.cpp
@@ -188,9 +188,9 @@ bool QJsonWebToken::setAlgorithmStr(const QString &strAlgorithm)
     // set algorithm
     m_strAlgorithm = strAlgorithm;
     // modify header
-    m_jdocHeader = QJsonDocument::fromJson(QObject::trUtf8("{\"typ\": \"JWT\", \"alg\" : \"").toUtf8()
+    m_jdocHeader = QJsonDocument::fromJson(QObject::tr("{\"typ\": \"JWT\", \"alg\" : \"").toUtf8()
                                            + m_strAlgorithm.toUtf8()
-                                           + QObject::trUtf8("\"}").toUtf8());
+                                           + QObject::tr("\"}").toUtf8());
 
     return true;
 }
diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h
index 1530654de..6acfaba41 100644
--- a/src/blackmisc/pq/measurementunit.h
+++ b/src/blackmisc/pq/measurementunit.h
@@ -427,7 +427,7 @@ namespace BlackMisc
                     {
                         s.insert(symbol.toLower());
                     }
-                    return s.toList();
+                    return s.values();
                 }();
                 return symbols;
             }
diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp
index 1cbf597c2..f6c2de773 100644
--- a/src/blackmisc/simulation/aircraftmodellist.cpp
+++ b/src/blackmisc/simulation/aircraftmodellist.cpp
@@ -1762,7 +1762,7 @@ namespace BlackMisc
             if (aircraftStats)
             {
                 const CAircraftIcaoCodeList icaos = this->getAircraftIcaoCodesFromDb();
-                QStringList designators(icaos.allDesignators().toList());
+                QStringList designators(icaos.allDesignators().values());
                 designators.sort();
                 stats += sep % sep %
                          u"Aircraft ICAOs from DB: " % sep %
diff --git a/src/blackmisc/simulation/aircraftmodelutils.cpp b/src/blackmisc/simulation/aircraftmodelutils.cpp
index 01d698c35..a911a3b78 100644
--- a/src/blackmisc/simulation/aircraftmodelutils.cpp
+++ b/src/blackmisc/simulation/aircraftmodelutils.cpp
@@ -70,7 +70,7 @@ namespace BlackMisc
 
             // to HTML
             QString html("<table>\n");
-            QStringList airlineIcaos = models.getAirlineVDesignators().toList();
+            QStringList airlineIcaos = models.getAirlineVDesignators().values();
             airlineIcaos.sort();
             airlineIcaos.push_front(colorLiveryDesignator);
             airlineIcaos.push_back(emptyDesignator);
diff --git a/src/blackmisc/simulation/autopublishdata.cpp b/src/blackmisc/simulation/autopublishdata.cpp
index ac5f569e4..50ffc05bd 100644
--- a/src/blackmisc/simulation/autopublishdata.cpp
+++ b/src/blackmisc/simulation/autopublishdata.cpp
@@ -209,8 +209,8 @@ namespace BlackMisc
 
         QSet<QString> CAutoPublishData::allModelStrings() const
         {
-            QSet<QString> allStrings(m_modelStringVsCG.keys().toSet());
-            allStrings.unite(m_modelStringVsSimulatorInfo.keys().toSet());
+            QSet<QString> allStrings(m_modelStringVsCG.keyBegin(), m_modelStringVsCG.keyEnd());
+            allStrings.unite(QSet<QString>(m_modelStringVsSimulatorInfo.keyBegin(), m_modelStringVsSimulatorInfo.keyEnd()));
             return allStrings;
         }
 
@@ -287,7 +287,7 @@ namespace BlackMisc
             {
                 const QFileInfo fi(fn.contains(dir.absolutePath()) ? fn : CFileUtils::appendFilePathsAndFixUnc(dir.absolutePath(), fn));
                 if (!fi.exists()) { continue; }
-                const QDateTime created = fi.created().toUTC();
+                const QDateTime created = fi.birthTime().toUTC();
                 if (deadline < created)
                 {
                     correctedList << fn;
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
index 070754577..ed32200b0 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
@@ -371,9 +371,9 @@ namespace BlackMisc
                 // store all entries
                 const QFileInfo fileInfo(fnFixed);
                 QDateTime fileTimestamp(fileInfo.lastModified());
-                if (!fileTimestamp.isValid() || fileInfo.created() > fileTimestamp)
+                if (!fileTimestamp.isValid() || fileInfo.birthTime() > fileTimestamp)
                 {
-                    fileTimestamp = fileInfo.created();
+                    fileTimestamp = fileInfo.birthTime();
                 }
                 Q_ASSERT_X(fileTimestamp.isValid(), Q_FUNC_INFO, "Missing file timestamp");
 
diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp
index 8dc762f27..6199f776f 100644
--- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp
+++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp
@@ -225,7 +225,7 @@ namespace BlackMisc
             QStringList CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths(const QString &simObjectsDir)
             {
                 // finding the user settings only works on P3D machine
-                QStringList allPaths = CFsCommonUtil::allFsxSimObjectPaths().toList();
+                QStringList allPaths = CFsCommonUtil::allFsxSimObjectPaths().values();
                 const QString sod = CFileUtils::normalizeFilePathToQtStandard(simObjectsDir.isEmpty() ? CFsCommonUtil::fsxSimObjectsDir() : simObjectsDir);
                 if (!sod.isEmpty() && !allPaths.contains(sod, Qt::CaseInsensitive))
                 {
@@ -242,7 +242,7 @@ namespace BlackMisc
             QStringList CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(const QString &simObjectsDir, const QString &versionHint)
             {
                 // finding the user settings only works on P3D machine
-                QStringList allPaths = CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(versionHint).toList();
+                QStringList allPaths = CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(versionHint).values();
                 const QString sod = CFileUtils::normalizeFilePathToQtStandard(simObjectsDir.isEmpty() ? CFsCommonUtil::p3dSimObjectsDir() : simObjectsDir);
                 if (!sod.isEmpty() && !allPaths.contains(sod, Qt::CaseInsensitive))
                 {
@@ -549,10 +549,10 @@ namespace BlackMisc
             QSet<QString> CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(const QString &versionHint)
             {
                 // all add-ons.cfg files
-                const QStringList addOnConfigFiles = CFsCommonUtil::findP3dAddOnConfigFiles(versionHint).toList();
+                const QStringList addOnConfigFiles = CFsCommonUtil::findP3dAddOnConfigFiles(versionHint).values();
 
                 // all PATH values in those files
-                const QStringList addOnPaths = CFsCommonUtil::allConfigFilesPathValues(addOnConfigFiles, true, {}).toList();
+                const QStringList addOnPaths = CFsCommonUtil::allConfigFilesPathValues(addOnConfigFiles, true, {}).values();
 
                 // based on all paths of all config files search the XML files
                 const QSet<QString> all = CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(addOnPaths, true);
@@ -704,15 +704,15 @@ namespace BlackMisc
             CStatusMessageList CFsCommonUtil::validateP3DSimObjectsPath(const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped, const QString &simulatorDir)
             {
                 const QString simObjectsDir = simulatorDir.isEmpty() ? CFsCommonUtil::p3dSimObjectsDir() : CFsCommonUtil::p3dSimObjectsDirFromSimDir(simulatorDir);
-                const QSet<QString> simObjectPaths = CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(simObjectsDir, "v4").toSet();
-                return CFsCommonUtil::validateSimObjectsPath(simObjectPaths, models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
+                const QStringList simObjectPaths = CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(simObjectsDir, "v4");
+                return CFsCommonUtil::validateSimObjectsPath(QSet<QString>(simObjectPaths.begin(), simObjectPaths.end()), models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
             }
 
             CStatusMessageList CFsCommonUtil::validateFSXSimObjectsPath(const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped, const QString &simulatorDir)
             {
                 Q_UNUSED(simulatorDir);
-                const QSet<QString> simObjectPaths = CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths().toSet();
-                return CFsCommonUtil::validateSimObjectsPath(simObjectPaths, models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
+                const QStringList simObjectPaths = CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths();
+                return CFsCommonUtil::validateSimObjectsPath(QSet<QString>(simObjectPaths.begin(), simObjectPaths.end()), models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
             }
 
             const QString CFsCommonUtil::airFileFilter()
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp
index 4ddab8d19..9da0e23c3 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp
@@ -91,7 +91,8 @@ namespace BlackMisc
                 QStringList remove(toUpper(modelsToBeRemoved));
                 remove.sort();
 
-                QSet<QString> removeSet(knownModels.toSet() & remove.toSet());
+                QSet<QString> removeSet(knownModels.begin(), knownModels.end());
+                removeSet &= QSet<QString>(remove.begin(), remove.end());
                 int c = 0;
                 for (const QString &model : removeSet)
                 {
@@ -108,7 +109,8 @@ namespace BlackMisc
                 QStringList keep(toUpper(modelsToBeKept));
                 keep.sort();
 
-                QSet<QString> removeSet(knownModels.toSet().subtract(keep.toSet()));
+                QSet<QString> removeSet(knownModels.begin(), knownModels.end());
+                removeSet.subtract(QSet<QString>(keep.begin(), keep.end()));
                 int c = 0;
                 for (const QString &model : removeSet)
                 {
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index c57bd6598..2e1023d58 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -406,7 +406,7 @@ namespace BlackMisc
         if (min == SeverityDebug && max == SeverityError) { static const QString all("all severities"); return all; }
         if (min == SeverityDebug) { return u"at or below " % severityToString(max); }
         if (max == SeverityError) { return u"at or above " % severityToString(min); }
-        auto list = severities.toList();
+        auto list = severities.values();
         std::sort(list.begin(), list.end());
         QStringList ret;
         std::transform(list.cbegin(), list.cend(), std::back_inserter(ret), severityToString);
diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp
index 0224ce4ed..f6028b4b6 100644
--- a/src/blackmisc/stringutils.cpp
+++ b/src/blackmisc/stringutils.cpp
@@ -414,7 +414,7 @@ namespace BlackMisc
     {
         if (set.isEmpty()) { return {}; }
         if (set.size() == 1) { return *set.begin(); }
-        return set.toList().join(separator);
+        return set.values().join(separator);
     }
 
     QMap<QString, QString> parseIniValues(const QString &data)
diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp
index 7d894cf88..14c54bf36 100644
--- a/src/blackmisc/valuecache.cpp
+++ b/src/blackmisc/valuecache.cpp
@@ -527,7 +527,7 @@ namespace BlackMisc
         auto values = getAllValues();
         QSet<QString> files;
         for (auto it = values.begin(); it != values.end(); ++it) { files.insert(dir + "/" + filenameForKey(it.key())); }
-        return files.toList();
+        return files.values();
     }
 
     void CValueCache::clearAllValues(const QString &keyPrefix)
diff --git a/tests/blackcore/testconnectivity/testconnectivity.cpp b/tests/blackcore/testconnectivity/testconnectivity.cpp
index 39f7122f5..721ae7065 100644
--- a/tests/blackcore/testconnectivity/testconnectivity.cpp
+++ b/tests/blackcore/testconnectivity/testconnectivity.cpp
@@ -76,7 +76,7 @@ namespace BlackCoreTest
     {
         if (!sApp->hasSetupReader()) { QSKIP("Cannot load bootstrap file, skip unit test"); }
         const CUrl url = sApp->getGlobalSetup().getDbHomePageUrl();
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         constexpr int max = 5;
         for (int i = 0; i < max; i++)
@@ -94,7 +94,7 @@ namespace BlackCoreTest
         if (!sApp->hasSetupReader()) { QSKIP("Cannot load bootstrap file, skip unit test"); }
         const CUrl url = sApp->getGlobalSetup().getDbHomePageUrl();
         const QString host(url.getHost());
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         constexpr int max = 5;
         for (int i = 0; i < max; i++)
diff --git a/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp b/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp
index cb21e1366..1ad8fc78f 100644
--- a/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp
+++ b/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp
@@ -244,7 +244,7 @@ namespace BlackMiscTest
             listOfLists2.back().setAdjustedSortHint(CAircraftSituationList::AdjustedTimestampLatestFirst);
         }
 
-        QTime time;
+        QElapsedTimer time;
         int cpuTime = getThreadCpuTimeMs();
         time.start();
         for (int i = 0; i < Loops; ++i)
diff --git a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp
index 6a433851a..c5ce58aab 100644
--- a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp
+++ b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp
@@ -124,7 +124,7 @@ namespace BlackMiscTest
             lngOld = lngDeg;
         }
 
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         int interpolationNo = 0;
         const qint64 startTimeMsSinceEpoch = ts - 2 * deltaT;
diff --git a/tests/blackmisc/teststringutils/teststringutils.cpp b/tests/blackmisc/teststringutils/teststringutils.cpp
index cfa87303a..61784dfa0 100644
--- a/tests/blackmisc/teststringutils/teststringutils.cpp
+++ b/tests/blackmisc/teststringutils/teststringutils.cpp
@@ -111,7 +111,7 @@ namespace BlackMiscTest
 
         // performance
         int constexpr Loops = 10000;
-        QTime time;
+        QElapsedTimer time;
         time.start();
         for (int i = 0; i < Loops; i++)
         {