diff --git a/mythtv/libs/libmythmetadata/metadatafactory.cpp b/mythtv/libs/libmythmetadata/metadatafactory.cpp
@@ -33,7 +33,7 @@
 #include "videometadata.h"
 
 
-QEvent::Type MetadataFactoryNoResult::kEventType =
+const QEvent::Type MetadataFactoryNoResult::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 MetadataFactoryNoResult::~MetadataFactoryNoResult()
@@ -45,7 +45,7 @@ MetadataFactoryNoResult::~MetadataFactoryNoResult()
     }
 }
 
-QEvent::Type MetadataFactorySingleResult::kEventType =
+const QEvent::Type MetadataFactorySingleResult::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 MetadataFactorySingleResult::~MetadataFactorySingleResult()
@@ -57,7 +57,7 @@ MetadataFactorySingleResult::~MetadataFactorySingleResult()
     }
 }
 
-QEvent::Type MetadataFactoryMultiResult::kEventType =
+const QEvent::Type MetadataFactoryMultiResult::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 // Force this class to have a vtable so that dynamic_cast works.
@@ -66,7 +66,7 @@ MetadataFactoryMultiResult::~MetadataFactoryMultiResult()
 {
 }
 
-QEvent::Type MetadataFactoryVideoChanges::kEventType =
+const QEvent::Type MetadataFactoryVideoChanges::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 // Force this class to have a vtable so that dynamic_cast works.

diff --git a/mythtv/libs/libmythmetadata/metadatafactory.h b/mythtv/libs/libmythmetadata/metadatafactory.h
@@ -26,7 +26,7 @@ class META_PUBLIC MetadataFactoryMultiResult : public QEvent
 
     MetadataLookupList m_results;
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC MetadataFactorySingleResult : public QEvent
@@ -44,7 +44,7 @@ class META_PUBLIC MetadataFactorySingleResult : public QEvent
 
     MetadataLookup *m_result {nullptr};
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC MetadataFactoryNoResult : public QEvent
@@ -62,7 +62,7 @@ class META_PUBLIC MetadataFactoryNoResult : public QEvent
 
     MetadataLookup *m_result {nullptr};
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC MetadataFactoryVideoChanges : public QEvent
@@ -79,7 +79,7 @@ class META_PUBLIC MetadataFactoryVideoChanges : public QEvent
     QList<int> m_moved; // intids moved to new filename
     QList<int> m_deleted; // orphaned/deleted intids
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC MetadataFactory : public QObject

diff --git a/mythtv/libs/libmythmetadata/metadataimagedownload.cpp b/mythtv/libs/libmythmetadata/metadataimagedownload.cpp
@@ -18,13 +18,13 @@
 
 #include "metadataimagedownload.h"
 
-QEvent::Type ImageDLEvent::kEventType =
+const QEvent::Type ImageDLEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
-QEvent::Type ImageDLFailureEvent::kEventType =
+const QEvent::Type ImageDLFailureEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
-QEvent::Type ThumbnailDLEvent::kEventType =
+const QEvent::Type ThumbnailDLEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 MetadataImageDownload::~MetadataImageDownload()

diff --git a/mythtv/libs/libmythmetadata/metadataimagedownload.h b/mythtv/libs/libmythmetadata/metadataimagedownload.h
@@ -38,7 +38,7 @@ class META_PUBLIC ImageDLEvent : public QEvent
 
     MetadataLookup *m_item {nullptr};
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC ImageDLFailureEvent : public QEvent
@@ -64,7 +64,7 @@ class META_PUBLIC ImageDLFailureEvent : public QEvent
 
     MetadataLookup *m_item {nullptr};
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC ThumbnailDLEvent : public QEvent
@@ -81,7 +81,7 @@ class META_PUBLIC ThumbnailDLEvent : public QEvent
 
     ThumbnailData *m_thumb {nullptr};
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC MetadataImageDownload : public MThread

diff --git a/mythtv/libs/libmythmetadata/videoscan.cpp b/mythtv/libs/libmythmetadata/videoscan.cpp
@@ -24,7 +24,7 @@
 #include "dbaccess.h"
 #include "dirscan.h"
 
-QEvent::Type VideoScanChanges::kEventType =
+const QEvent::Type VideoScanChanges::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 namespace

diff --git a/mythtv/libs/libmythmetadata/videoscan.h b/mythtv/libs/libmythmetadata/videoscan.h
@@ -54,7 +54,7 @@ class META_PUBLIC VideoScanChanges : public QEvent
     QList<int> m_moved; // intids moved to new filename
     QList<int> m_deleted; // orphaned/deleted intids
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class META_PUBLIC VideoScannerThread : public MThread

diff --git a/mythtv/libs/libmythtv/channelscan/scanmonitor.cpp b/mythtv/libs/libmythtv/channelscan/scanmonitor.cpp
@@ -35,29 +35,29 @@
 // Qt headers
 #include <QCoreApplication>
 
-QEvent::Type ScannerEvent::ScanComplete =
+const QEvent::Type ScannerEvent::ScanComplete =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::ScanShutdown =
+const QEvent::Type ScannerEvent::ScanShutdown =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::ScanErrored =
+const QEvent::Type ScannerEvent::ScanErrored =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::AppendTextToLog =
+const QEvent::Type ScannerEvent::AppendTextToLog =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusText =
+const QEvent::Type ScannerEvent::SetStatusText =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusTitleText =
+const QEvent::Type ScannerEvent::SetStatusTitleText =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetPercentComplete =
+const QEvent::Type ScannerEvent::SetPercentComplete =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusRotorPosition =
+const QEvent::Type ScannerEvent::SetStatusRotorPosition =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusSignalToNoise =
+const QEvent::Type ScannerEvent::SetStatusSignalToNoise =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusSignalStrength =
+const QEvent::Type ScannerEvent::SetStatusSignalStrength =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusSignalLock =
+const QEvent::Type ScannerEvent::SetStatusSignalLock =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type ScannerEvent::SetStatusChannelTuned =
+const QEvent::Type ScannerEvent::SetStatusChannelTuned =
     (QEvent::Type) QEvent::registerEventType();
 
 /// Percentage to set to after the transports have been scanned

diff --git a/mythtv/libs/libmythtv/channelscan/scanmonitor.h b/mythtv/libs/libmythtv/channelscan/scanmonitor.h
@@ -103,18 +103,18 @@ class ScannerEvent : public QEvent
     void    ConfigurableValue(Configurable *cfg_ptr)
         { m_cfgPtr = cfg_ptr; }
 
-    static Type ScanComplete;
-    static Type ScanShutdown;
-    static Type ScanErrored;
-    static Type AppendTextToLog;
-    static Type SetStatusText;
-    static Type SetStatusTitleText;
-    static Type SetPercentComplete;
-    static Type SetStatusRotorPosition;
-    static Type SetStatusSignalToNoise;
-    static Type SetStatusSignalStrength;
-    static Type SetStatusSignalLock;
-    static Type SetStatusChannelTuned;
+    static const Type ScanComplete;
+    static const Type ScanShutdown;
+    static const Type ScanErrored;
+    static const Type AppendTextToLog;
+    static const Type SetStatusText;
+    static const Type SetStatusTitleText;
+    static const Type SetPercentComplete;
+    static const Type SetStatusRotorPosition;
+    static const Type SetStatusSignalToNoise;
+    static const Type SetStatusSignalStrength;
+    static const Type SetStatusSignalLock;
+    static const Type SetStatusChannelTuned;
 
   private:
     ~ScannerEvent() override = default;

diff --git a/mythtv/libs/libmythui/devices/jsmenuevent.cpp b/mythtv/libs/libmythui/devices/jsmenuevent.cpp
@@ -7,5 +7,5 @@
 // Own header
 #include "devices/jsmenuevent.h"
 
-QEvent::Type JoystickKeycodeEvent::kEventType =
+const QEvent::Type JoystickKeycodeEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
diff --git a/mythtv/libs/libmythui/devices/jsmenuevent.h b/mythtv/libs/libmythui/devices/jsmenuevent.h
@@ -29,7 +29,7 @@ class JoystickKeycodeEvent : public QEvent
     Qt::KeyboardModifiers keyModifiers() const { return m_keyModifiers; }
     QEvent::Type keyAction() const { return m_keyAction; }
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     QString m_jsmenueventtext;

diff --git a/mythtv/libs/libmythui/devices/lircevent.cpp b/mythtv/libs/libmythui/devices/lircevent.cpp
@@ -1,5 +1,5 @@
 
 #include "lircevent.h"
 
-QEvent::Type LircKeycodeEvent::kEventType =
+const QEvent::Type LircKeycodeEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
diff --git a/mythtv/libs/libmythui/devices/lircevent.h b/mythtv/libs/libmythui/devices/lircevent.h
@@ -24,7 +24,7 @@ class LircKeycodeEvent : public QEvent
     QString               text(void)      const { return m_text;      }
     QString               lirctext(void)  const { return m_lirctext;  }
 
-    static Type kEventType;
+    static const Type kEventType;
 
     static const unsigned kLIRCInvalidKeyCombo  = 0xFFFFFFFF;
 

diff --git a/mythtv/libs/libmythui/mythdialogbox.cpp b/mythtv/libs/libmythui/mythdialogbox.cpp
@@ -24,7 +24,7 @@
 #include "mythuispinbox.h"
 #include "mythgesture.h"
 
-QEvent::Type DialogCompletionEvent::kEventType =
+const QEvent::Type DialogCompletionEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 // Force this class to have a vtable so that dynamic_cast works.

diff --git a/mythtv/libs/libmythui/mythdialogbox.h b/mythtv/libs/libmythui/mythdialogbox.h
@@ -54,7 +54,7 @@ class MUI_PUBLIC DialogCompletionEvent : public QEvent
     QString GetResultText() { return m_resultText; }
     QVariant GetData() { return m_resultData; }
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     QString m_id;

diff --git a/mythtv/libs/libmythui/mythgesture.cpp b/mythtv/libs/libmythui/mythgesture.cpp
@@ -38,7 +38,7 @@
 #include <algorithm>
 #include <complex>
 
-QEvent::Type MythGestureEvent::kEventType = static_cast<QEvent::Type>(QEvent::registerEventType());
+const QEvent::Type MythGestureEvent::kEventType = static_cast<QEvent::Type>(QEvent::registerEventType());
 
 /*! \class MythGestureEvent
  * \brief A custom event that represents a mouse gesture.

diff --git a/mythtv/libs/libmythui/mythgesture.h b/mythtv/libs/libmythui/mythgesture.h
@@ -88,7 +88,7 @@ class MUI_PUBLIC MythGestureEvent : public QEvent
     Qt::MouseButton GetButton   () const { return m_button; }
     QString         GetButtonName() const;
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     Gesture m_gesture { Unknown  };

diff --git a/mythtv/libs/libmythui/mythnotificationcenter.cpp b/mythtv/libs/libmythui/mythnotificationcenter.cpp
@@ -34,7 +34,7 @@ static constexpr std::chrono::milliseconds DEFAULT_DURATION { 5s };
 
 //// MythNotificationCenterEvent
 
-QEvent::Type MythNotificationCenterEvent::kEventType =
+const QEvent::Type MythNotificationCenterEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 //// class MythNotificationScreenStack

diff --git a/mythtv/libs/libmythui/mythnotificationcenter.h b/mythtv/libs/libmythui/mythnotificationcenter.h
@@ -27,7 +27,7 @@ class MUI_PUBLIC MythNotificationCenterEvent : public MythEvent
 public:
     MythNotificationCenterEvent() : MythEvent(kEventType) { }
 
-    static Type kEventType;
+    static const Type kEventType;
 
     // No implicit copying.
     MythNotificationCenterEvent(MythNotificationCenterEvent &&) = delete;

diff --git a/mythtv/libs/libmythui/mythprogressdialog.cpp b/mythtv/libs/libmythui/mythprogressdialog.cpp
@@ -9,7 +9,7 @@
 #include "mythuitext.h"
 #include "mythuiprogressbar.h"
 
-QEvent::Type ProgressUpdateEvent::kEventType =
+const QEvent::Type ProgressUpdateEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 // Force this class to have a vtable so that dynamic_cast works.

diff --git a/mythtv/libs/libmythui/mythprogressdialog.h b/mythtv/libs/libmythui/mythprogressdialog.h
@@ -25,7 +25,7 @@ class MUI_PUBLIC ProgressUpdateEvent : public QEvent
     uint GetTotal() const { return m_total; }
     uint GetCount() const { return m_count; }
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     uint m_total {0};

diff --git a/mythtv/libs/libmythui/mythscreentype.cpp b/mythtv/libs/libmythui/mythscreentype.cpp
@@ -38,7 +38,7 @@ class SemaphoreLocker
     QSemaphore *m_lock {nullptr};
 };
 
-QEvent::Type ScreenLoadCompletionEvent::kEventType =
+const QEvent::Type ScreenLoadCompletionEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 class ScreenLoadTask : public QRunnable

diff --git a/mythtv/libs/libmythui/mythscreentype.h b/mythtv/libs/libmythui/mythscreentype.h
@@ -30,7 +30,7 @@ class MUI_PUBLIC ScreenLoadCompletionEvent : public QEvent
 
     QString GetId() { return m_id; }
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     QString m_id;

diff --git a/mythtv/libs/libmythui/mythuibuttonlist.cpp b/mythtv/libs/libmythui/mythuibuttonlist.cpp
@@ -2725,10 +2725,10 @@ class NextButtonListPageEvent : public QEvent
         QEvent(kEventType), m_start(start), m_pageSize(pageSize) {}
     const int m_start;
     const int m_pageSize;
-    static Type kEventType;
+    static const Type kEventType;
 };
 
-QEvent::Type NextButtonListPageEvent::kEventType =
+const QEvent::Type NextButtonListPageEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 void MythUIButtonList::customEvent(QEvent *event)

diff --git a/mythtv/libs/libmythui/mythuiimage.cpp b/mythtv/libs/libmythui/mythuiimage.cpp
@@ -462,7 +462,7 @@ class ImageLoadEvent : public QEvent
     AnimationFrames *GetAnimationFrames() const { return m_images; }
     bool GetAbortState() const        { return m_aborted; }
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     const MythUIImage *m_parent   {nullptr};
@@ -478,7 +478,7 @@ class ImageLoadEvent : public QEvent
     bool               m_aborted;
 };
 
-QEvent::Type ImageLoadEvent::kEventType =
+const QEvent::Type ImageLoadEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 /*!

diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
@@ -630,7 +630,7 @@ AudioTestThread::AudioTestThread(QObject *parent,
     }
 }
 
-QEvent::Type ChannelChangedEvent::kEventType =
+const QEvent::Type ChannelChangedEvent::kEventType =
     static_cast<QEvent::Type>(QEvent::registerEventType());
 
 AudioTestThread::~AudioTestThread()

diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.h b/mythtv/programs/mythfrontend/audiogeneralsettings.h
@@ -141,7 +141,7 @@ class ChannelChangedEvent : public QEvent
     QString m_channel;
     bool    m_fulltest;
 
-    static Type kEventType;
+    static const Type kEventType;
 };
 
 class AudioTestThread : public MThread

diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -346,9 +346,9 @@ class UpdateGuideEvent : public QEvent
     explicit UpdateGuideEvent(GuideUpdaterBase *updater) :
         QEvent(kEventType), m_updater(updater) {}
     GuideUpdaterBase *m_updater {nullptr};
-    static Type kEventType;
+    static const Type kEventType;
 };
-QEvent::Type UpdateGuideEvent::kEventType =
+const QEvent::Type UpdateGuideEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 class GuideHelper : public QRunnable

diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp
@@ -56,9 +56,9 @@
 static constexpr qint64 FE_SHORT_TO {  2000 }; //  2 seconds
 static constexpr qint64 FE_LONG_TO  { 10000 }; // 10 seconds
 
-static QEvent::Type kNetworkControlDataReadyEvent =
+static const QEvent::Type kNetworkControlDataReadyEvent =
     (QEvent::Type) QEvent::registerEventType();
-QEvent::Type NetworkControlCloseEvent::kEventType =
+const QEvent::Type NetworkControlCloseEvent::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
 static const QRegularExpression kChanID1RE { "^\\d+$" };

diff --git a/mythtv/programs/mythfrontend/networkcontrol.h b/mythtv/programs/mythfrontend/networkcontrol.h
@@ -85,7 +85,7 @@ class NetworkControlCloseEvent : public QEvent
 
     NetworkControlClient *getClient() { return m_networkControlClient; }
 
-    static Type kEventType;
+    static const Type kEventType;
 
   private:
     NetworkControlClient *m_networkControlClient {nullptr};