6 files changed, 36 insertions, 33 deletions
diff --git a/src/core/api/qwebenginesettings.cpp b/src/core/api/qwebenginesettings.cpp
index f19d8efe5..a7ae80cd1 100644
--- a/src/core/api/qwebenginesettings.cpp
+++ b/src/core/api/qwebenginesettings.cpp
@@ -115,7 +115,7 @@ QWebEngineSettings::ImageAnimationPolicy QWebEngineSettings::imageAnimationPolic
 
 void QWebEngineSettings::resetImageAnimationPolicy()
 {
-    d_ptr->setImageAnimationPolicy(QWebEngineSettings::InheritedImageAnimationPolicy);
+    d_ptr->setImageAnimationPolicy(QWebEngineSettings::ImageAnimationPolicy::Inherited);
 }
 
 QT_END_NAMESPACE
diff --git a/src/core/api/qwebenginesettings.h b/src/core/api/qwebenginesettings.h
index 7f89f1ea6..f6b5dfe4d 100644
--- a/src/core/api/qwebenginesettings.h
+++ b/src/core/api/qwebenginesettings.h
@@ -78,11 +78,11 @@ public:
         AllowAllUnknownUrlSchemes
     };
 
-    enum ImageAnimationPolicy {
-        InheritedImageAnimationPolicy = 0,
-        AllowImageAnimation,
-        AnimateImageOnce,
-        DisallowImageAnimation
+    enum class ImageAnimationPolicy : uint8_t {
+        Inherited = 0,
+        Allow,
+        AnimateOnce,
+        Disallow,
     };
 
 public:
diff --git a/src/core/doc/src/qwebenginesettings_lgpl.qdoc b/src/core/doc/src/qwebenginesettings_lgpl.qdoc
index cd7ff8e8c..dbe9c1d34 100644
--- a/src/core/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/core/doc/src/qwebenginesettings_lgpl.qdoc
@@ -208,13 +208,13 @@
     This enum describes how an image animation should be handled when the image frames
     are rendered for animation.
 
-    \value AllowImageAnimation
+    \value Allow
            Allows image animation when the image frames are rendered.
-    \value AnimateImageOnce
+    \value AnimateOnce
            Animate the image once when the image frames are rendered.
-    \value DisallowImageAnimation
+    \value Disallow
            Disallows image animation when the image frames are rendered.
-    \omitvalue InheritedImageAnimationPolicy
+    \omitvalue Inherited
 
     \sa imageAnimationPolicy setImageAnimationPolicy resetImageAnimationPolicy
 */
@@ -312,7 +312,7 @@
     \fn QWebEngineSettings::ImageAnimationPolicy QWebEngineSettings::imageAnimationPolicy() const
     \since Qt 6.8
     Returns the currently selected policy for handling image animation when the image frames are rendered.
-    Default is \l{QWebEngineSettings::AllowImageAnimation}.
+    Default is \l{QWebEngineSettings::ImageAnimationPolicy::Allow}.
     \sa setImageAnimationPolicy resetImageAnimationPolicy
 */
 
@@ -320,13 +320,13 @@
     \fn void QWebEngineSettings::setImageAnimationPolicy(QWebEngineSettings::ImageAnimationPolicy policy)
     \since Qt 6.8
     Sets the policy for handling image animation when the image frames are rendered to \a policy.
-    Default is \l{QWebEngineSettings::AllowImageAnimation}.
+    Default is \l{QWebEngineSettings::ImageAnimationPolicy::Allow}.
     \sa imageAnimationPolicy resetImageAnimationPolicy
 */
 
 /*!
     \fn void QWebEngineSettings::resetImageAnimationPolicy()
-    \since Qt 6.7
+    \since Qt 6.8
     Removes the policy for handling image animation.
     \sa imageAnimationPolicy setImageAnimationPolicy
 */
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index e302998f0..452ba6393 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -60,12 +60,14 @@ blink::mojom::ImageAnimationPolicy
 toBlinkImageAnimationPolicy(QWebEngineSettings::ImageAnimationPolicy policy)
 {
     switch (policy) {
-    case QWebEngineSettings::AllowImageAnimation:
+    case QWebEngineSettings::ImageAnimationPolicy::Allow:
         return blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyAllowed;
-    case QWebEngineSettings::AnimateImageOnce:
+    case QWebEngineSettings::ImageAnimationPolicy::AnimateOnce:
         return blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyAnimateOnce;
-    case QWebEngineSettings::DisallowImageAnimation:
+    case QWebEngineSettings::ImageAnimationPolicy::Disallow:
         return blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyNoAnimation;
+    case QWebEngineSettings::ImageAnimationPolicy::Inherited:
+        break;
     }
     return blink::mojom::ImageAnimationPolicy::kImageAnimationPolicyAllowed;
 }
@@ -74,7 +76,7 @@ WebEngineSettings::WebEngineSettings(WebEngineSettings *_parentSettings)
     : m_adapter(nullptr)
     , parentSettings(_parentSettings)
     , m_unknownUrlSchemePolicy(QWebEngineSettings::InheritedUnknownUrlSchemePolicy)
-    , m_imageAnimationPolicy(QWebEngineSettings::InheritedImageAnimationPolicy)
+    , m_imageAnimationPolicy(QWebEngineSettings::ImageAnimationPolicy::Inherited)
 {
     if (parentSettings)
         parentSettings->childSettings.insert(this);
@@ -217,13 +219,13 @@ void WebEngineSettings::setImageAnimationPolicy(QWebEngineSettings::ImageAnimati
 
 QWebEngineSettings::ImageAnimationPolicy WebEngineSettings::imageAnimationPolicy() const
 {
-    if (m_imageAnimationPolicy != QWebEngineSettings::InheritedImageAnimationPolicy)
+    if (m_imageAnimationPolicy != QWebEngineSettings::ImageAnimationPolicy::Inherited)
         return m_imageAnimationPolicy;
 
     if (parentSettings)
         return parentSettings->imageAnimationPolicy();
 
-    return QWebEngineSettings::AllowImageAnimation;
+    return QWebEngineSettings::ImageAnimationPolicy::Allow;
 }
 
 QWebEngineSettings::UnknownUrlSchemePolicy WebEngineSettings::unknownUrlSchemePolicy() const
@@ -333,7 +335,7 @@ void WebEngineSettings::initDefaults()
 
     m_defaultEncoding = QStringLiteral("ISO-8859-1");
     m_unknownUrlSchemePolicy = QWebEngineSettings::InheritedUnknownUrlSchemePolicy;
-    m_imageAnimationPolicy = QWebEngineSettings::InheritedImageAnimationPolicy;
+    m_imageAnimationPolicy = QWebEngineSettings::ImageAnimationPolicy::Inherited;
 }
 
 void WebEngineSettings::scheduleApply()
diff --git a/src/webenginequick/api/qquickwebenginesettings.cpp b/src/webenginequick/api/qquickwebenginesettings.cpp
index 5dc093a44..4a66605d6 100644
--- a/src/webenginequick/api/qquickwebenginesettings.cpp
+++ b/src/webenginequick/api/qquickwebenginesettings.cpp
@@ -496,11 +496,12 @@ QString QQuickWebEngineSettings::defaultTextEncoding() const
     return d_ptr->defaultTextEncoding();
 }
 
-ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::AllowImageAnimation,
-                   QWebEngineSettings::AllowImageAnimation)
-ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::AnimateImageOnce, QWebEngineSettings::AnimateImageOnce)
-ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::DisallowImageAnimation,
-                   QWebEngineSettings::DisallowImageAnimation)
+ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::ImageAnimationPolicy::Allow,
+                   QWebEngineSettings::ImageAnimationPolicy::Allow)
+ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::ImageAnimationPolicy::AnimateOnce,
+                   QWebEngineSettings::ImageAnimationPolicy::AnimateOnce)
+ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::ImageAnimationPolicy::Disallow,
+                   QWebEngineSettings::ImageAnimationPolicy::Disallow)
 /*!
     \qmlproperty enumeration WebEngineSettings::imageAnimationPolicy
     \since QtWebEngine 6.8
@@ -508,14 +509,14 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineSettings::DisallowImageAnimation,
     Specifies how an image animation should be handled when the image frames
     are rendered for animation.
 
-    \value WebEngineSettings.AllowImageAnimation
+    \value WebEngineSettings.ImageAnimationPolicy.Allow
            Allows all image animations when the image frames are rendered.
-    \value WebEngineSettings.AnimateImageOnce
+    \value WebEngineSettings.ImageAnimationPolicy.AnimateOnce
            Animate the image once when the image frames are rendered.
-    \value WebEngineSettings.DisallowImageAnimation
+    \value WebEngineSettings.ImageAnimationPolicy.Disallow
            Disallows all image animations when the image frames are rendered.
 
-    Default value is \c {WebEngineSettings.AllowImageAnimation}.
+    Default value is \c {WebEngineSettings.ImageAnimationPolicy.Allow}.
 */
 QQuickWebEngineSettings::ImageAnimationPolicy QQuickWebEngineSettings::imageAnimationPolicy() const
 {
diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h
index ed3c77884..3320c45d8 100644
--- a/src/webenginequick/api/qquickwebenginesettings_p.h
+++ b/src/webenginequick/api/qquickwebenginesettings_p.h
@@ -74,10 +74,10 @@ public:
 
     Q_ENUM(UnknownUrlSchemePolicy)
 
-    enum ImageAnimationPolicy {
-        AllowImageAnimation = 1,
-        AnimateImageOnce,
-        DisallowImageAnimation
+    enum class ImageAnimationPolicy : uint8_t {
+        Allow = 1,
+        AnimateOnce,
+        Disallow,
     };
 
     Q_ENUM(ImageAnimationPolicy)