Promote suffixless graphics api enum values in GraphicsInfo

Amends 23dbe3d6e0d3338812ad9f614028a6fdc5a54090. A similar change
was done to QSGRendererInterface. Therefore the QML API should
follow suit.

Change-Id: I2f6d1aeefc17bf3b58b7683f46511d4433194e1c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

2 files changed, 11 insertions, 7 deletions

diff --git a/src/quick/items/qquickgraphicsinfo.cpp b/src/quick/items/qquickgraphicsinfo.cpp
index e39e0e7afa..c4acfe3714 100644
--- a/src/quick/items/qquickgraphicsinfo.cpp
+++ b/src/quick/items/qquickgraphicsinfo.cpp
@@ -93,13 +93,12 @@ QQuickGraphicsInfo *QQuickGraphicsInfo::qmlAttachedProperties(QObject *object)
     \list
     \li GraphicsInfo.Unknown - the default value when no active scenegraph is associated with the item
     \li GraphicsInfo.Software - Qt Quick's software renderer based on QPainter with the raster paint engine
-    \li GraphicsInfo.OpenGL - OpenGL or OpenGL ES
     \li GraphicsInfo.OpenVG - OpenVG
-    \li GraphicsInfo.OpenGLRhi - OpenGL on top of QRhi, a graphics abstraction layer
-    \li GraphicsInfo.Direct3D11Rhi - Direct3D 11 on top of QRhi, a graphics abstraction layer
-    \li GraphicsInfo.VulkanRhi - Vulkan on top of QRhi, a graphics abstraction layer
-    \li GraphicsInfo.MetalRhi - Metal on top of QRhi, a graphics abstraction layer
-    \li GraphicsInfo.NullRhi - Null (no output) on top of QRhi, a graphics abstraction layer
+    \li GraphicsInfo.OpenGL - OpenGL or OpenGL ES on top of QRhi, a graphics abstraction layer
+    \li GraphicsInfo.Direct3D11 - Direct3D 11 on top of QRhi, a graphics abstraction layer
+    \li GraphicsInfo.Vulkan - Vulkan on top of QRhi, a graphics abstraction layer
+    \li GraphicsInfo.Metal - Metal on top of QRhi, a graphics abstraction layer
+    \li GraphicsInfo.Null - Null (no output) on top of QRhi, a graphics abstraction layer
     \endlist
  */
 
diff --git a/src/quick/items/qquickgraphicsinfo_p.h b/src/quick/items/qquickgraphicsinfo_p.h
index c55a35ed5e..66f3d4168e 100644
--- a/src/quick/items/qquickgraphicsinfo_p.h
+++ b/src/quick/items/qquickgraphicsinfo_p.h
@@ -84,8 +84,13 @@ public:
     enum GraphicsApi {
         Unknown = QSGRendererInterface::Unknown,
         Software = QSGRendererInterface::Software,
-        OpenGL = QSGRendererInterface::OpenGL,
         OpenVG = QSGRendererInterface::OpenVG,
+        OpenGL = QSGRendererInterface::OpenGL,
+        Direct3D11 = QSGRendererInterface::Direct3D11,
+        Vulkan = QSGRendererInterface::Vulkan,
+        Metal = QSGRendererInterface::Metal,
+        Null = QSGRendererInterface::Null,
+
         OpenGLRhi = QSGRendererInterface::OpenGLRhi,
         Direct3D11Rhi = QSGRendererInterface::Direct3D11Rhi,
         VulkanRhi = QSGRendererInterface::VulkanRhi,