Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h
index 1816732594..8495b51a5a 100644
--- a/src/plugins/platforms/windows/qwindowscursor.h
+++ b/src/plugins/platforms/windows/qwindowscursor.h
@@ -89,10 +89,10 @@ typedef QSharedPointer<CursorHandle> CursorHandlePtr;
 class QWindowsCursor : public QPlatformCursor
 {
 public:
-    enum CursorState {
-        CursorShowing,
-        CursorHidden,
-        CursorSuppressed // Cursor suppressed by touch interaction (Windows 8).
+    enum class State {
+        Showing,
+        Hidden,
+        Suppressed // Cursor suppressed by touch interaction (Windows 8).
     };
 
     struct PixmapCursor {
@@ -119,7 +119,7 @@ public:
 
     static HCURSOR createCursorFromShape(Qt::CursorShape cursorShape, const QPlatformScreen *screen = nullptr);
     static QPoint mousePosition();
-    static CursorState cursorState();
+    static State cursorState();
 
     CursorHandlePtr standardWindowCursor(Qt::CursorShape s = Qt::ArrowCursor);
     CursorHandlePtr pixmapWindowCursor(const QCursor &c);