aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlengine.h
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2020-08-26 12:19:18 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-08-31 10:42:09 +0000
commitf0cf6483ec73291fcef424951b69511388956acb (patch)
tree1106f9a8fb009a788664ef2c143d2659e435b621 /src/qml/qml/qqmlengine.h
parentbb263b057df71144428fd1981eba7e505bf22b89 (diff)
QQmlImageProviderBase: Address Qt 6 TODO
Reorder the enum entries to make Invalid the zero value, so that we can extend it in the future. Change-Id: I6903d25c8f5d84c88bcfbfdbff55723da6c21eb9 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine.h')
-rw-r--r--src/qml/qml/qqmlengine.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h
index aeb5756712..ec597bc521 100644
--- a/src/qml/qml/qqmlengine.h
+++ b/src/qml/qml/qqmlengine.h
@@ -53,13 +53,12 @@ QT_BEGIN_NAMESPACE
class Q_QML_EXPORT QQmlImageProviderBase
{
public:
- enum ImageType {
+ enum ImageType : int {
+ Invalid = 0,
Image,
Pixmap,
Texture,
- Invalid,
- ImageResponse
- // ### Qt6: reorder these, and give Invalid a fixed large value
+ ImageResponse,
};
enum Flag {