1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index 5a92a7cf90..d20edd685e 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -518,7 +518,7 @@ QWindowsMenu::~QWindowsMenu()
 void QWindowsMenu::insertMenuItem(QPlatformMenuItem *menuItemIn, QPlatformMenuItem *before)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << '(' << menuItemIn << ", before=" << before << ')' << this;
-    QWindowsMenuItem *menuItem = static_cast<QWindowsMenuItem *>(menuItemIn);
+    auto *menuItem = static_cast<QWindowsMenuItem *>(menuItemIn);
     const int index = insertBefore(&m_menuItems, menuItemIn, before);
     const bool append = index == m_menuItems.size() - 1;
     menuItem->insertIntoMenu(this, append, index);
@@ -689,7 +689,7 @@ void QWindowsPopupMenu::showPopup(const QWindow *parentWindow, const QRect &targ
                                   const QPlatformMenuItem *item)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << '>' << this << parentWindow << targetRect << item;
-    const QWindowsBaseWindow *window = static_cast<const QWindowsBaseWindow *>(parentWindow->handle());
+    const auto *window = static_cast<const QWindowsBaseWindow *>(parentWindow->handle());
     const QPoint globalPos = window->mapToGlobal(targetRect.topLeft());
     trackPopupMenu(window->handle(), globalPos.x(), globalPos.y());
 }
@@ -756,7 +756,7 @@ QWindowsMenuBar::~QWindowsMenuBar()
 void QWindowsMenuBar::insertMenu(QPlatformMenu *menuIn, QPlatformMenu *before)
 {
     qCDebug(lcQpaMenus) << __FUNCTION__ << menuIn << "before=" << before;
-    QWindowsMenu *menu = static_cast<QWindowsMenu *>(menuIn);
+    auto *menu = static_cast<QWindowsMenu *>(menuIn);
     const int index = insertBefore(&m_menus, menuIn, before);
     menu->insertIntoMenuBar(this, index == m_menus.size() - 1, index);
 }
@@ -784,7 +784,7 @@ void QWindowsMenuBar::handleReparent(QWindow *newParentWindow)
     if (QPlatformWindow *platWin = newParentWindow->handle())
         install(static_cast<QWindowsWindow *>(platWin));
     else // Store for later creation, see menuBarOf()
-        newParentWindow->setProperty(menuBarPropertyName, qVariantFromValue<QObject *>(this));
+        newParentWindow->setProperty(menuBarPropertyName, QVariant::fromValue<QObject *>(this));
 }
 
 QWindowsMenuBar *QWindowsMenuBar::menuBarOf(const QWindow *notYetCreatedWindow)
@@ -896,8 +896,8 @@ void QWindowsMenuItem::formatDebug(QDebug &d) const
         d << ", parentMenu=" << static_cast<const void *>(m_parentMenu);
     if (m_subMenu)
         d << ", subMenu=" << static_cast<const void *>(m_subMenu);
-    d << ", tag=" << showbase << hex
-      << tag() << noshowbase << dec << ", id=" << m_id;
+    d << ", tag=" << Qt::showbase << Qt::hex
+      << tag() << Qt::noshowbase << Qt::dec << ", id=" << m_id;
 #if QT_CONFIG(shortcut)
     if (!m_shortcut.isEmpty())
         d << ", shortcut=" << m_shortcut;
@@ -933,7 +933,7 @@ void QWindowsMenu::formatDebug(QDebug &d) const
     if (m_parentMenu != nullptr)
         d << " [on menu]";
     if (tag())
-        d << ", tag=" << showbase << hex << tag() << noshowbase << dec;
+        d << ", tag=" << Qt::showbase << Qt::hex << tag() << Qt::noshowbase << Qt::dec;
     if (m_visible)
         d << " [visible]";
     if (m_enabled)