From b61d52f98ac35c705debb5cea9195f6f2bd2ea6c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 24 May 2019 14:43:58 +0200
Subject: Windows QPA: Replace Q_DISABLE_COPY by Q_DISABLE_COPY_MOVE

Fix clang warnings like:
warning: class 'QWindowsStaticOpenGLContext' defines a default destructor, a copy constructor and a copy assignment operator but does not define a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions

Change-Id: I736d20476ef407100b6ecb654d1112106e545758
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h         | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h               | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h        | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp        | 2 +-
 src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h          | 2 +-
 src/plugins/platforms/windows/qwindowsbackingstore.h                  | 2 +-
 src/plugins/platforms/windows/qwindowsclipboard.h                     | 2 +-
 src/plugins/platforms/windows/qwindowscombase.h                       | 2 +-
 src/plugins/platforms/windows/qwindowscontext.h                       | 2 +-
 src/plugins/platforms/windows/qwindowscursor.h                        | 2 +-
 src/plugins/platforms/windows/qwindowsdialoghelpers.cpp               | 2 +-
 src/plugins/platforms/windows/qwindowsdialoghelpers.h                 | 2 +-
 src/plugins/platforms/windows/qwindowseglcontext.h                    | 2 +-
 src/plugins/platforms/windows/qwindowsglcontext.cpp                   | 2 +-
 src/plugins/platforms/windows/qwindowsglcontext.h                     | 2 +-
 src/plugins/platforms/windows/qwindowsinputcontext.h                  | 2 +-
 src/plugins/platforms/windows/qwindowsintegration.cpp                 | 2 +-
 src/plugins/platforms/windows/qwindowsintegration.h                   | 2 +-
 src/plugins/platforms/windows/qwindowskeymapper.h                     | 2 +-
 src/plugins/platforms/windows/qwindowsmime.h                          | 4 ++--
 src/plugins/platforms/windows/qwindowsmousehandler.h                  | 2 +-
 src/plugins/platforms/windows/qwindowsopenglcontext.h                 | 4 ++--
 src/plugins/platforms/windows/qwindowsopengltester.cpp                | 2 +-
 src/plugins/platforms/windows/qwindowspointerhandler.h                | 2 +-
 src/plugins/platforms/windows/qwindowssessionmanager.h                | 2 +-
 src/plugins/platforms/windows/qwindowstabletsupport.h                 | 2 +-
 src/plugins/platforms/windows/qwindowstheme.h                         | 2 +-
 src/plugins/platforms/windows/qwindowsthreadpoolrunner.h              | 2 +-
 src/plugins/platforms/windows/qwindowsvulkaninstance.h                | 2 +-
 src/plugins/platforms/windows/qwindowswindow.h                        | 2 +-
 src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h  | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiagriditemprovider.h      | 2 +-
 src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h  | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiainvokeprovider.h        | 2 +-
 src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h  | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h    | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiaselectionprovider.h     | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiatableitemprovider.h     | 2 +-
 src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h | 2 +-
 src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h  | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h     | 2 +-
 .../platforms/windows/uiautomation/qwindowsuiatoggleprovider.h        | 2 +-
 src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h | 2 +-
 44 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
index f72ea2b038..6d4d47e3da 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h
@@ -48,7 +48,7 @@ class QWindowsDirect2DWindow;
 
 class QWindowsDirect2DBackingStore : public QPlatformBackingStore
 {
-    Q_DISABLE_COPY(QWindowsDirect2DBackingStore)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DBackingStore)
 
 public:
     QWindowsDirect2DBackingStore(QWindow *window);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
index d8a8a49aec..8fd683106d 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.h
@@ -59,7 +59,7 @@ class QColor;
 class QWindowsDirect2DBitmap
 {
     Q_DECLARE_PRIVATE(QWindowsDirect2DBitmap)
-    Q_DISABLE_COPY(QWindowsDirect2DBitmap)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DBitmap)
 public:
     QWindowsDirect2DBitmap();
     QWindowsDirect2DBitmap(ID2D1Bitmap1 *bitmap, ID2D1DeviceContext *dc);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
index aee0eb867d..a28c674671 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.h
@@ -91,7 +91,7 @@ private:
 };
 
 class QWindowsDirect2DDeviceContextSuspender {
-    Q_DISABLE_COPY(QWindowsDirect2DDeviceContextSuspender)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DDeviceContextSuspender)
 
     QWindowsDirect2DDeviceContext *m_dc;
 public:
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index fa201c784e..1b82db0b37 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -1800,7 +1800,7 @@ void QWindowsDirect2DPaintEngine::resume()
 
 class QWindowsDirect2DPaintEngineSuspenderImpl
 {
-    Q_DISABLE_COPY(QWindowsDirect2DPaintEngineSuspenderImpl)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DPaintEngineSuspenderImpl)
     QWindowsDirect2DPaintEngine *m_engine;
     bool m_active;
 public:
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
index 6404c60b13..f61e908bce 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h
@@ -128,7 +128,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWindowsDirect2DPaintEngine::Flags)
 class QWindowsDirect2DPaintEngineSuspenderPrivate;
 class QWindowsDirect2DPaintEngineSuspender
 {
-    Q_DISABLE_COPY(QWindowsDirect2DPaintEngineSuspender)
+    Q_DISABLE_COPY_MOVE(QWindowsDirect2DPaintEngineSuspender)
     Q_DECLARE_PRIVATE(QWindowsDirect2DPaintEngineSuspender)
     QScopedPointer<QWindowsDirect2DPaintEngineSuspenderPrivate> d_ptr;
 public:
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.h b/src/plugins/platforms/windows/qwindowsbackingstore.h
index 088ab3b257..b96c8f0e61 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.h
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.h
@@ -52,7 +52,7 @@ class QWindowsNativeImage;
 
 class QWindowsBackingStore : public QPlatformBackingStore
 {
-    Q_DISABLE_COPY(QWindowsBackingStore)
+    Q_DISABLE_COPY_MOVE(QWindowsBackingStore)
 public:
     QWindowsBackingStore(QWindow *window);
     ~QWindowsBackingStore() override;
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h
index 1068de15fa..24a6bc908d 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.h
+++ b/src/plugins/platforms/windows/qwindowsclipboard.h
@@ -58,7 +58,7 @@ protected:
 
 class QWindowsClipboard : public QPlatformClipboard
 {
-    Q_DISABLE_COPY(QWindowsClipboard)
+    Q_DISABLE_COPY_MOVE(QWindowsClipboard)
 public:
     QWindowsClipboard();
     ~QWindowsClipboard() override;
diff --git a/src/plugins/platforms/windows/qwindowscombase.h b/src/plugins/platforms/windows/qwindowscombase.h
index 6b25d665dc..45cba9c68b 100644
--- a/src/plugins/platforms/windows/qwindowscombase.h
+++ b/src/plugins/platforms/windows/qwindowscombase.h
@@ -80,7 +80,7 @@ bool qWindowsComQueryUnknownInterfaceMulti(Derived *d, REFIID id, LPVOID *iface)
 // Helper base class to provide IUnknown methods for COM classes (single inheritance)
 template <class ComInterface> class QWindowsComBase : public ComInterface
 {
-    Q_DISABLE_COPY(QWindowsComBase)
+    Q_DISABLE_COPY_MOVE(QWindowsComBase)
 public:
     explicit QWindowsComBase(ULONG initialRefCount = 1) : m_ref(initialRefCount) {}
     virtual ~QWindowsComBase() = default;
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index ac6e5bbb9f..d94ae3f73b 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -155,7 +155,7 @@ struct QWindowsShcoreDLL {
 
 class QWindowsContext
 {
-    Q_DISABLE_COPY(QWindowsContext)
+    Q_DISABLE_COPY_MOVE(QWindowsContext)
 public:
 
     enum SystemInfoFlags
diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h
index 2e57c80def..d5c189b5ca 100644
--- a/src/plugins/platforms/windows/qwindowscursor.h
+++ b/src/plugins/platforms/windows/qwindowscursor.h
@@ -68,7 +68,7 @@ inline uint qHash(const QWindowsPixmapCursorCacheKey &k, uint seed) noexcept
 
 class CursorHandle
 {
-    Q_DISABLE_COPY(CursorHandle)
+    Q_DISABLE_COPY_MOVE(CursorHandle)
 public:
     explicit CursorHandle(HCURSOR hcursor = nullptr) : m_hcursor(hcursor) {}
     ~CursorHandle()
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index e0bd38c951..e55b8fd7b8 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -507,7 +507,7 @@ class QWindowsNativeFileDialogBase;
 
 class QWindowsNativeFileDialogEventHandler : public QWindowsComBase<IFileDialogEvents>
 {
-    Q_DISABLE_COPY(QWindowsNativeFileDialogEventHandler)
+    Q_DISABLE_COPY_MOVE(QWindowsNativeFileDialogEventHandler)
 public:
     static IFileDialogEvents *create(QWindowsNativeFileDialogBase *nativeFileDialog);
 
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
index 1cf2e50732..f0a7ef5e90 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h
@@ -64,7 +64,7 @@ namespace QWindowsDialogs
 template <class BaseClass>
 class QWindowsDialogHelperBase : public BaseClass
 {
-    Q_DISABLE_COPY(QWindowsDialogHelperBase)
+    Q_DISABLE_COPY_MOVE(QWindowsDialogHelperBase)
 public:
     typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr;
     ~QWindowsDialogHelperBase() { cleanupThread(); }
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.h b/src/plugins/platforms/windows/qwindowseglcontext.h
index 8a1e1ddae8..d96e266159 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.h
+++ b/src/plugins/platforms/windows/qwindowseglcontext.h
@@ -109,7 +109,7 @@ private:
 
 class QWindowsEGLStaticContext : public QWindowsStaticOpenGLContext
 {
-    Q_DISABLE_COPY(QWindowsEGLStaticContext)
+    Q_DISABLE_COPY_MOVE(QWindowsEGLStaticContext)
 
 public:
     static QWindowsEGLStaticContext *create(QWindowsOpenGLTester::Renderers preferredType);
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index d534ce87cd..66dd32d05e 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -916,7 +916,7 @@ void QWindowsOpenGLContextFormat::apply(QSurfaceFormat *format) const
 
 class QOpenGLTemporaryContext
 {
-    Q_DISABLE_COPY(QOpenGLTemporaryContext)
+    Q_DISABLE_COPY_MOVE(QOpenGLTemporaryContext)
 public:
     QOpenGLTemporaryContext();
     ~QOpenGLTemporaryContext();
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h
index 5f26d1bc8c..1abe2eb390 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.h
+++ b/src/plugins/platforms/windows/qwindowsglcontext.h
@@ -134,7 +134,7 @@ private:
 
 class QOpenGLStaticContext : public QWindowsStaticOpenGLContext
 {
-    Q_DISABLE_COPY(QOpenGLStaticContext)
+    Q_DISABLE_COPY_MOVE(QOpenGLStaticContext)
     QOpenGLStaticContext();
 public:
     enum Extensions
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h
index a97c3401a6..857706bcb9 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.h
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.h
@@ -53,7 +53,7 @@ class QWindowsWindow;
 
 class QWindowsInputContext : public QPlatformInputContext
 {
-    Q_DISABLE_COPY(QWindowsInputContext)
+    Q_DISABLE_COPY_MOVE(QWindowsInputContext)
     Q_OBJECT
 
     struct CompositionContext
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 8dd3810463..f0754e3e57 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -133,7 +133,7 @@ QT_BEGIN_NAMESPACE
 
 struct QWindowsIntegrationPrivate
 {
-    Q_DISABLE_COPY(QWindowsIntegrationPrivate)
+    Q_DISABLE_COPY_MOVE(QWindowsIntegrationPrivate)
     explicit QWindowsIntegrationPrivate(const QStringList &paramList);
     ~QWindowsIntegrationPrivate();
 
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index 015cf79b6c..b49d21022b 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -54,7 +54,7 @@ class QWindowsStaticOpenGLContext;
 
 class QWindowsIntegration : public QPlatformIntegration
 {
-    Q_DISABLE_COPY(QWindowsIntegration)
+    Q_DISABLE_COPY_MOVE(QWindowsIntegration)
 public:
     enum Options { // Options to be passed on command line.
         FontDatabaseFreeType = 0x1,
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.h b/src/plugins/platforms/windows/qwindowskeymapper.h
index a454f0f973..b1ada1d373 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.h
+++ b/src/plugins/platforms/windows/qwindowskeymapper.h
@@ -71,7 +71,7 @@ struct KeyboardLayoutItem {
 
 class QWindowsKeyMapper
 {
-    Q_DISABLE_COPY(QWindowsKeyMapper)
+    Q_DISABLE_COPY_MOVE(QWindowsKeyMapper)
 public:
     explicit QWindowsKeyMapper();
     ~QWindowsKeyMapper();
diff --git a/src/plugins/platforms/windows/qwindowsmime.h b/src/plugins/platforms/windows/qwindowsmime.h
index cc6faf7847..1c389e8800 100644
--- a/src/plugins/platforms/windows/qwindowsmime.h
+++ b/src/plugins/platforms/windows/qwindowsmime.h
@@ -53,7 +53,7 @@ class QMimeData;
 
 class QWindowsMime
 {
-    Q_DISABLE_COPY(QWindowsMime)
+    Q_DISABLE_COPY_MOVE(QWindowsMime)
 public:
     QWindowsMime();
     virtual ~QWindowsMime();
@@ -73,7 +73,7 @@ public:
 
 class QWindowsMimeConverter
 {
-    Q_DISABLE_COPY(QWindowsMimeConverter)
+    Q_DISABLE_COPY_MOVE(QWindowsMimeConverter)
 public:
     QWindowsMimeConverter();
     ~QWindowsMimeConverter();
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.h b/src/plugins/platforms/windows/qwindowsmousehandler.h
index 309f6004b2..1d3d1f4761 100644
--- a/src/plugins/platforms/windows/qwindowsmousehandler.h
+++ b/src/plugins/platforms/windows/qwindowsmousehandler.h
@@ -54,7 +54,7 @@ class QTouchDevice;
 
 class QWindowsMouseHandler
 {
-    Q_DISABLE_COPY(QWindowsMouseHandler)
+    Q_DISABLE_COPY_MOVE(QWindowsMouseHandler)
 public:
     QWindowsMouseHandler();
 
diff --git a/src/plugins/platforms/windows/qwindowsopenglcontext.h b/src/plugins/platforms/windows/qwindowsopenglcontext.h
index 1ad911bc69..1416a7e575 100644
--- a/src/plugins/platforms/windows/qwindowsopenglcontext.h
+++ b/src/plugins/platforms/windows/qwindowsopenglcontext.h
@@ -51,7 +51,7 @@ class QWindowsOpenGLContext;
 
 class QWindowsStaticOpenGLContext
 {
-    Q_DISABLE_COPY(QWindowsStaticOpenGLContext)
+    Q_DISABLE_COPY_MOVE(QWindowsStaticOpenGLContext)
 public:
     static QWindowsStaticOpenGLContext *create();
     virtual ~QWindowsStaticOpenGLContext() = default;
@@ -75,7 +75,7 @@ private:
 
 class QWindowsOpenGLContext : public QPlatformOpenGLContext
 {
-    Q_DISABLE_COPY(QWindowsOpenGLContext)
+    Q_DISABLE_COPY_MOVE(QWindowsOpenGLContext)
 public:
     // Returns the native context handle (e.g. HGLRC for WGL, EGLContext for EGL).
     virtual void *nativeContext() const = 0;
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp
index 35418a18e7..ff495c8290 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.cpp
+++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp
@@ -83,7 +83,7 @@ static GpuDescription adapterIdentifierToGpuDescription(const D3DADAPTER_IDENTIF
 class QDirect3D9Handle
 {
 public:
-    Q_DISABLE_COPY(QDirect3D9Handle)
+    Q_DISABLE_COPY_MOVE(QDirect3D9Handle)
 
     QDirect3D9Handle();
     ~QDirect3D9Handle();
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.h b/src/plugins/platforms/windows/qwindowspointerhandler.h
index ccbb1d3939..068e804007 100644
--- a/src/plugins/platforms/windows/qwindowspointerhandler.h
+++ b/src/plugins/platforms/windows/qwindowspointerhandler.h
@@ -55,7 +55,7 @@ class QTouchDevice;
 
 class QWindowsPointerHandler
 {
-    Q_DISABLE_COPY(QWindowsPointerHandler)
+    Q_DISABLE_COPY_MOVE(QWindowsPointerHandler)
 public:
     QWindowsPointerHandler() = default;
     bool translatePointerEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, LRESULT *result);
diff --git a/src/plugins/platforms/windows/qwindowssessionmanager.h b/src/plugins/platforms/windows/qwindowssessionmanager.h
index 4c4256f2b0..0769ed1fce 100644
--- a/src/plugins/platforms/windows/qwindowssessionmanager.h
+++ b/src/plugins/platforms/windows/qwindowssessionmanager.h
@@ -79,7 +79,7 @@ private:
     bool m_blockUserInput = false;
     bool m_canceled = false;
 
-    Q_DISABLE_COPY(QWindowsSessionManager)
+    Q_DISABLE_COPY_MOVE(QWindowsSessionManager)
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.h b/src/plugins/platforms/windows/qwindowstabletsupport.h
index 8f97982308..6bcf3357a5 100644
--- a/src/plugins/platforms/windows/qwindowstabletsupport.h
+++ b/src/plugins/platforms/windows/qwindowstabletsupport.h
@@ -110,7 +110,7 @@ QDebug operator<<(QDebug d, const QWindowsTabletDeviceData &t);
 
 class QWindowsTabletSupport
 {
-    Q_DISABLE_COPY(QWindowsTabletSupport)
+    Q_DISABLE_COPY_MOVE(QWindowsTabletSupport)
 
     explicit QWindowsTabletSupport(HWND window, HCTX context);
 
diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index 4ff9b6d57d..4e24308445 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -51,7 +51,7 @@ class QWindow;
 
 class QWindowsTheme : public QPlatformTheme
 {
-    Q_DISABLE_COPY(QWindowsTheme)
+    Q_DISABLE_COPY_MOVE(QWindowsTheme)
 public:
     QWindowsTheme();
     ~QWindowsTheme() override;
diff --git a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
index 731e4b5432..ffe2e62069 100644
--- a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
+++ b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 */
 class QWindowsThreadPoolRunner
 {
-    Q_DISABLE_COPY(QWindowsThreadPoolRunner)
+    Q_DISABLE_COPY_MOVE(QWindowsThreadPoolRunner)
 
 #if QT_CONFIG(thread)
     template <class RunnableFunction> // nested class implementing QRunnable to execute a function.
diff --git a/src/plugins/platforms/windows/qwindowsvulkaninstance.h b/src/plugins/platforms/windows/qwindowsvulkaninstance.h
index 3292137c39..cc7ef476d4 100644
--- a/src/plugins/platforms/windows/qwindowsvulkaninstance.h
+++ b/src/plugins/platforms/windows/qwindowsvulkaninstance.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 class QWindowsVulkanInstance : public QBasicPlatformVulkanInstance
 {
-    Q_DISABLE_COPY(QWindowsVulkanInstance)
+    Q_DISABLE_COPY_MOVE(QWindowsVulkanInstance)
 public:
     QWindowsVulkanInstance(QVulkanInstance *instance);
 
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index 2967f44e7d..7efbcf900c 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -117,7 +117,7 @@ struct QWindowsWindowData
 
 class QWindowsBaseWindow : public QPlatformWindow
 {
-    Q_DISABLE_COPY(QWindowsBaseWindow)
+    Q_DISABLE_COPY_MOVE(QWindowsBaseWindow)
 public:
     explicit QWindowsBaseWindow(QWindow *window) : QPlatformWindow(window) {}
 
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h
index 9caa7d6898..a20df28e3f 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiabaseprovider.h
@@ -57,7 +57,7 @@ class QAccessibleInterface;
 class QWindowsUiaBaseProvider : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWindowsUiaBaseProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaBaseProvider)
 public:
     explicit QWindowsUiaBaseProvider(QAccessible::Id id);
     virtual ~QWindowsUiaBaseProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h
index 3d17056d38..3244122038 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiagriditemprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaGridItemProvider : public QWindowsUiaBaseProvider,
                                     public QWindowsComBase<IGridItemProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaGridItemProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaGridItemProvider)
 public:
     explicit QWindowsUiaGridItemProvider(QAccessible::Id id);
     virtual ~QWindowsUiaGridItemProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h
index b96fc1a93c..0e5f81108e 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiagridprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaGridProvider : public QWindowsUiaBaseProvider,
                                 public QWindowsComBase<IGridProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaGridProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaGridProvider)
 public:
     explicit QWindowsUiaGridProvider(QAccessible::Id id);
     virtual ~QWindowsUiaGridProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
index 5fb509c5f3..7d646894a1 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaInvokeProvider : public QWindowsUiaBaseProvider,
                                   public QWindowsComBase<IInvokeProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaInvokeProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaInvokeProvider)
 public:
     explicit QWindowsUiaInvokeProvider(QAccessible::Id id);
     virtual ~QWindowsUiaInvokeProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
index df0d60f9c9..cdc239ed99 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.h
@@ -60,7 +60,7 @@ class QWindowsUiaMainProvider :
     public IRawElementProviderFragmentRoot
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWindowsUiaMainProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaMainProvider)
 public:
     static QWindowsUiaMainProvider *providerForAccessible(QAccessibleInterface *accessible);
     explicit QWindowsUiaMainProvider(QAccessibleInterface *a, int initialRefCount = 1);
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h
index c5e0a03ee5..fc82d3a2cc 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiarangevalueprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaRangeValueProvider : public QWindowsUiaBaseProvider,
                                       public QWindowsComBase<IRangeValueProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaRangeValueProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaRangeValueProvider)
 public:
     explicit QWindowsUiaRangeValueProvider(QAccessible::Id id);
     virtual ~QWindowsUiaRangeValueProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h
index 1f2605188b..4b59c4e40f 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaSelectionItemProvider : public QWindowsUiaBaseProvider,
                                          public QWindowsComBase<ISelectionItemProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaSelectionItemProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaSelectionItemProvider)
 public:
     explicit QWindowsUiaSelectionItemProvider(QAccessible::Id id);
     virtual ~QWindowsUiaSelectionItemProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h
index 0376d25804..ee1044ec7a 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaSelectionProvider : public QWindowsUiaBaseProvider,
                                      public QWindowsComBase<ISelectionProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaSelectionProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaSelectionProvider)
 public:
     explicit QWindowsUiaSelectionProvider(QAccessible::Id id);
     virtual ~QWindowsUiaSelectionProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h
index bf4b52ee0b..9804c35f8e 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableitemprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTableItemProvider : public QWindowsUiaBaseProvider,
                                      public QWindowsComBase<ITableItemProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaTableItemProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTableItemProvider)
 public:
     explicit QWindowsUiaTableItemProvider(QAccessible::Id id);
     virtual ~QWindowsUiaTableItemProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h
index 94c8ab93a7..a8b16035ec 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatableprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTableProvider : public QWindowsUiaBaseProvider,
                                  public QWindowsComBase<ITableProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaTableProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTableProvider)
 public:
     explicit QWindowsUiaTableProvider(QAccessible::Id id);
     virtual ~QWindowsUiaTableProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h
index a9be70fa16..ffab48b0e8 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTextProvider : public QWindowsUiaBaseProvider,
                                 public QWindowsComBase<ITextProvider2>
 {
-    Q_DISABLE_COPY(QWindowsUiaTextProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTextProvider)
 public:
     explicit QWindowsUiaTextProvider(QAccessible::Id id);
     ~QWindowsUiaTextProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h
index 39b9069fc0..3b4ec63ceb 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaTextRangeProvider : public QWindowsUiaBaseProvider,
                                      public QWindowsComBase<ITextRangeProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaTextRangeProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaTextRangeProvider)
 public:
     explicit QWindowsUiaTextRangeProvider(QAccessible::Id id, int startOffset, int endOffset);
     virtual ~QWindowsUiaTextRangeProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h
index 2bed6f7e36..892b635b41 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatoggleprovider.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaToggleProvider : public QWindowsUiaBaseProvider,
                                   public QWindowsComBase<IToggleProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaToggleProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaToggleProvider)
 public:
     explicit QWindowsUiaToggleProvider(QAccessible::Id id);
     virtual ~QWindowsUiaToggleProvider();
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h
index 334a17e51d..3edfe7a08b 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiavalueprovider.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsUiaValueProvider : public QWindowsUiaBaseProvider,
                                  public QWindowsComBase<IValueProvider>
 {
-    Q_DISABLE_COPY(QWindowsUiaValueProvider)
+    Q_DISABLE_COPY_MOVE(QWindowsUiaValueProvider)
 public:
     explicit QWindowsUiaValueProvider(QAccessible::Id id);
     virtual ~QWindowsUiaValueProvider();
-- 
cgit v1.2.3