diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2024-06-10 12:50:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2024-06-20 12:19:56 +0200 |
| commit | edcdccfa232f995f5fc738fc2655f21a30d24f46 (patch) | |
| tree | 75c26ea1497facf6442a4d29c7a75241e943bbf1 /src/webenginequick | |
| parent | 1caa4fd26b25d97507e916780e34e70720ceb0b2 (diff) | |
Make ImageAnimationPolicy a scoped enum
Pick-to: 6.8
Change-Id: I2c03c6d56d18f37e60b287c337c67718178fbb2b
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/api/qquickwebenginesettings.cpp | 19 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebenginesettings_p.h | 8 |
2 files changed, 14 insertions, 13 deletions
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) |