diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index 970e4e224..3c82c4214 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -382,7 +382,7 @@ namespace BlackCore
                         matchedModel = candidates.minOrderOrDefault();
                         break;
                     }
-                    Q_FALLTHROUGH();
+                    [[fallthrough]];
                 case CAircraftMatcherSetup::PickFirst: // fallthru intentionally
                 default:
                     usedStrategy = CAircraftMatcherSetup::PickFirst; // re-assigned if fall-through
diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index 53cf45f19..1cd9c372e 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -618,7 +618,7 @@ namespace BlackGui
                     // fall thru intended
                     this->formatVPilotView();
                 }
-                Q_FALLTHROUGH();
+                [[fallthrough]];
             default:
                 {
                     ui->frp_Editors->setVisible(true);
diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/blackgui/models/aircraftmodellistmodel.cpp
index 737068b63..52db47caf 100644
--- a/src/blackgui/models/aircraftmodellistmodel.cpp
+++ b/src/blackgui/models/aircraftmodellistmodel.cpp
@@ -75,7 +75,7 @@ namespace BlackGui
             case OwnModelSet:
                 // intentional fall thru
                 m_columns.addColumn(CColumn::orderColumn());
-                Q_FALLTHROUGH();
+                [[fallthrough]];
 
             case OwnAircraftModelMappingTool:
             case StashModel:
diff --git a/src/blackgui/models/distributorlistmodel.cpp b/src/blackgui/models/distributorlistmodel.cpp
index 2fca040d9..20b7797c9 100644
--- a/src/blackgui/models/distributorlistmodel.cpp
+++ b/src/blackgui/models/distributorlistmodel.cpp
@@ -45,7 +45,7 @@ namespace BlackGui
             {
             case NormalWithOrder:
                 m_columns.addColumn(CColumn::orderColumn());
-                Q_FALLTHROUGH();
+                [[fallthrough]];
             case NotSet:
             case Normal:
                 {
@@ -64,7 +64,7 @@ namespace BlackGui
 
             case MinimalWithOrder:
                 m_columns.addColumn(CColumn::orderColumn());
-                Q_FALLTHROUGH();
+                [[fallthrough]];
             case Minimal:
                 {
                     m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey));
diff --git a/src/blackgui/models/statusmessagelistmodel.cpp b/src/blackgui/models/statusmessagelistmodel.cpp
index e9c825fc8..4d6c17f97 100644
--- a/src/blackgui/models/statusmessagelistmodel.cpp
+++ b/src/blackgui/models/statusmessagelistmodel.cpp
@@ -81,7 +81,7 @@ namespace BlackGui
             {
             case DetailedWithOrder:
                 m_columns.addColumn(CColumn::orderColumn());
-                Q_FALLTHROUGH();
+                [[fallthrough]];
             case Detailed:
                 {
                     m_columns.addColumn(CColumn("time", CStatusMessage::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHmsz())));
@@ -94,7 +94,7 @@ namespace BlackGui
                 break;
             case SimplifiedWithOrder:
                 m_columns.addColumn(CColumn::orderColumn());
-                Q_FALLTHROUGH();
+                [[fallthrough]];
             case Simplified:
                 {
                     m_columns.addColumn(CColumn("time", CStatusMessage::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHmsz())));
diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index 0f6754d4a..d9cc6f65d 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -397,7 +397,7 @@ namespace BlackMisc
                     const int c =  Compare::compare(this->getGroundElevationInfo(), compareValue.getGroundElevationInfo());
                     if (c != 0) { return c; }
                 }
-                Q_FALLTHROUGH();
+                [[fallthrough]];
             case IndexGroundElevationInfoTransferred: return Compare::compare(m_isElvInfoTransferred, compareValue.m_isElvInfoTransferred);
             case IndexCanLikelySkipNearGroundInterpolation: return Compare::compare(this->canLikelySkipNearGroundInterpolation(), compareValue.canLikelySkipNearGroundInterpolation());
             default: break;
diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp
index 4783824f7..a0e0a8ced 100644
--- a/src/blackmisc/logpattern.cpp
+++ b/src/blackmisc/logpattern.cpp
@@ -174,11 +174,11 @@ namespace BlackMisc
         {
         default:
         case CStatusMessage::SeverityDebug:     result.m_severities.insert(CStatusMessage::SeverityDebug);
-        Q_FALLTHROUGH();
+        [[fallthrough]];
         case CStatusMessage::SeverityInfo:      result.m_severities.insert(CStatusMessage::SeverityInfo);
-        Q_FALLTHROUGH();
+        [[fallthrough]];
         case CStatusMessage::SeverityWarning:   result.m_severities.insert(CStatusMessage::SeverityWarning);
-        Q_FALLTHROUGH();
+        [[fallthrough]];
         case CStatusMessage::SeverityError:     result.m_severities.insert(CStatusMessage::SeverityError);
         }
         return result;