6 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h
index 3faa08afb9..6cb30a2f79 100644
--- a/src/plugins/styles/android/qandroidstyle_p.h
+++ b/src/plugins/styles/android/qandroidstyle_p.h
@@ -371,7 +371,7 @@ public:
     void unpolish(QWidget *widget);
 
 private:
-    Q_DISABLE_COPY(QAndroidStyle)
+    Q_DISABLE_COPY_MOVE(QAndroidStyle)
     static ItemType qtControl(QStyle::ComplexControl control);
     static ItemType qtControl(QStyle::ContentsType contentsType);
     static ItemType qtControl(QStyle::ControlElement controlElement);
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index c2b6fbfead..04fa280f39 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -3951,7 +3951,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                                       titleRect.width());
 
                 const auto text = p->fontMetrics().elidedText(dwOpt->title, Qt::ElideRight, titleRect.width());
-                proxy()->drawItemText(p, titleRect, Qt::AlignCenter | Qt::TextShowMnemonic, dwOpt->palette,
+                proxy()->drawItemText(p, titleRect, Qt::AlignCenter, dwOpt->palette,
                                       dwOpt->state & State_Enabled, text, QPalette::WindowText);
             }
             p->restore();
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p.h b/src/plugins/styles/mac/qmacstyle_mac_p.h
index d6874001d3..88f104cccf 100644
--- a/src/plugins/styles/mac/qmacstyle_mac_p.h
+++ b/src/plugins/styles/mac/qmacstyle_mac_p.h
@@ -115,7 +115,7 @@ public:
                       const QWidget *widget = 0) const;
 
 private:
-    Q_DISABLE_COPY(QMacStyle)
+    Q_DISABLE_COPY_MOVE(QMacStyle)
     Q_DECLARE_PRIVATE(QMacStyle)
 };
 
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h b/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h
index 0ebb0eb41a..43a2a670f8 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h
@@ -99,7 +99,7 @@ public:
     QPalette standardPalette() const override;
 
 private:
-    Q_DISABLE_COPY(QWindowsVistaStyle)
+    Q_DISABLE_COPY_MOVE(QWindowsVistaStyle)
     Q_DECLARE_PRIVATE(QWindowsVistaStyle)
     friend class QStyleFactory;
 };
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index 4b583e13d3..43e8b37f71 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -511,8 +511,8 @@ QRegion QWindowsXPStylePrivate::region(XPThemeData &themeData)
         if (numBytes == 0)
             return QRegion();
 
-        char *buf = new char[numBytes];
-        if (buf == 0)
+        char *buf = new (std::nothrow) char[numBytes];
+        if (!buf)
             return QRegion();
 
         RGNDATA *rd = reinterpret_cast<RGNDATA*>(buf);
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h b/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h
index 7e9f4ddda6..0f70105b0e 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h
@@ -96,7 +96,7 @@ public:
                        const QWidget *widget = nullptr) const override;
 
 private:
-    Q_DISABLE_COPY(QWindowsXPStyle)
+    Q_DISABLE_COPY_MOVE(QWindowsXPStyle)
     Q_DECLARE_PRIVATE(QWindowsXPStyle)
     friend class QStyleFactory;
 };