Qt Designer: Replace Q_DISABLE_COPY by Q_DISABLE_COPY_MOVE

Fix clang warnings like:
warning: class '...' 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: I12ead44ddea8f6f69d75f99bea61e69ecac36db4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 

60 files changed, 176 insertions, 176 deletions

diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.h b/src/designer/src/components/formeditor/deviceprofiledialog.h
index 539827c78..e44ba0663 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.h
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.h
@@ -61,7 +61,7 @@ class DeviceProfile;
 
 class DeviceProfileDialog : public QDialog
 {
-    Q_DISABLE_COPY(DeviceProfileDialog)
+    Q_DISABLE_COPY_MOVE(DeviceProfileDialog)
     Q_OBJECT
 public:
     explicit DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QWidget *parent = nullptr);
diff --git a/src/designer/src/components/formeditor/dpi_chooser.h b/src/designer/src/components/formeditor/dpi_chooser.h
index 2ff7f9b77..0efa2cdd0 100644
--- a/src/designer/src/components/formeditor/dpi_chooser.h
+++ b/src/designer/src/components/formeditor/dpi_chooser.h
@@ -53,7 +53,7 @@ struct DPI_Entry;
 
 /* Let the user choose a DPI settings */
 class DPI_Chooser : public QWidget {
-    Q_DISABLE_COPY(DPI_Chooser)
+    Q_DISABLE_COPY_MOVE(DPI_Chooser)
     Q_OBJECT
 
 public:
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index c09571070..6f70c2872 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -81,7 +81,7 @@ static bool ask(QWidget *parent,
 
 // ------------ EmbeddedOptionsControlPrivate
 class EmbeddedOptionsControlPrivate {
-     Q_DISABLE_COPY(EmbeddedOptionsControlPrivate)
+     Q_DISABLE_COPY_MOVE(EmbeddedOptionsControlPrivate)
 public:
     EmbeddedOptionsControlPrivate(QDesignerFormEditorInterface *core);
     void init(EmbeddedOptionsControl *q);
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.h b/src/designer/src/components/formeditor/embeddedoptionspage.h
index 9522aa53f..8a412ed4c 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.h
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.h
@@ -44,7 +44,7 @@ class EmbeddedOptionsControlPrivate;
 /* EmbeddedOptions Control. Presents the user with a list of embedded
  * device profiles he can modify/add/delete. */
 class EmbeddedOptionsControl : public QWidget {
-    Q_DISABLE_COPY(EmbeddedOptionsControl)
+    Q_DISABLE_COPY_MOVE(EmbeddedOptionsControl)
     Q_OBJECT
 public:
     explicit EmbeddedOptionsControl(QDesignerFormEditorInterface *core, QWidget *parent = nullptr);
@@ -71,7 +71,7 @@ private:
 // EmbeddedOptionsPage
 class EmbeddedOptionsPage : public QDesignerOptionsPageInterface
 {
-    Q_DISABLE_COPY(EmbeddedOptionsPage)
+    Q_DISABLE_COPY_MOVE(EmbeddedOptionsPage)
 public:
     explicit EmbeddedOptionsPage(QDesignerFormEditorInterface *core);
 
diff --git a/src/designer/src/components/formeditor/formeditor_optionspage.cpp b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
index 0ad956d7e..03bc44d15 100644
--- a/src/designer/src/components/formeditor/formeditor_optionspage.cpp
+++ b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
@@ -54,7 +54,7 @@ namespace qdesigner_internal {
 
 // Zoom, currently for preview only
 class ZoomSettingsWidget : public QGroupBox {
-    Q_DISABLE_COPY(ZoomSettingsWidget)
+    Q_DISABLE_COPY_MOVE(ZoomSettingsWidget)
 public:
     explicit ZoomSettingsWidget(QWidget *parent = nullptr);
 
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 6f58d0255..41035d722 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE
 namespace {
 class BlockSelection
 {
-    Q_DISABLE_COPY(BlockSelection)
+    Q_DISABLE_COPY_MOVE(BlockSelection)
 public:
     BlockSelection(qdesigner_internal::FormWindow *fw)
         : m_formWindow(fw),
@@ -131,7 +131,7 @@ namespace qdesigner_internal {
 
 class FormWindow::Selection
 {
-    Q_DISABLE_COPY(Selection)
+    Q_DISABLE_COPY_MOVE(Selection)
 public:
     Selection();
     ~Selection();
diff --git a/src/designer/src/components/formeditor/formwindowsettings.h b/src/designer/src/components/formeditor/formwindowsettings.h
index 04bac0be4..8d06097a6 100644
--- a/src/designer/src/components/formeditor/formwindowsettings.h
+++ b/src/designer/src/components/formeditor/formwindowsettings.h
@@ -49,7 +49,7 @@ class FormWindowBase;
 
 class FormWindowSettings: public QDialog
 {
-    Q_DISABLE_COPY(FormWindowSettings)
+    Q_DISABLE_COPY_MOVE(FormWindowSettings)
     Q_OBJECT
 public:
     explicit FormWindowSettings(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/components/formeditor/previewactiongroup.h b/src/designer/src/components/formeditor/previewactiongroup.h
index 168c6c603..2e5d77dca 100644
--- a/src/designer/src/components/formeditor/previewactiongroup.h
+++ b/src/designer/src/components/formeditor/previewactiongroup.h
@@ -53,7 +53,7 @@ namespace qdesigner_internal {
 
 class PreviewActionGroup : public QActionGroup
 {
-    Q_DISABLE_COPY(PreviewActionGroup)
+    Q_DISABLE_COPY_MOVE(PreviewActionGroup)
     Q_OBJECT
 public:
     explicit PreviewActionGroup(QDesignerFormEditorInterface *core, QObject *parent = nullptr);
diff --git a/src/designer/src/components/formeditor/templateoptionspage.h b/src/designer/src/components/formeditor/templateoptionspage.h
index 660e41268..374713fed 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.h
+++ b/src/designer/src/components/formeditor/templateoptionspage.h
@@ -51,7 +51,7 @@ namespace Ui {
 class TemplateOptionsWidget : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TemplateOptionsWidget)
+    Q_DISABLE_COPY_MOVE(TemplateOptionsWidget)
 public:
     explicit TemplateOptionsWidget(QDesignerFormEditorInterface *core,
                                               QWidget *parent = nullptr);
@@ -75,7 +75,7 @@ private:
 
 class TemplateOptionsPage : public QDesignerOptionsPageInterface
 {
-     Q_DISABLE_COPY(TemplateOptionsPage)
+     Q_DISABLE_COPY_MOVE(TemplateOptionsPage)
 public:
     explicit TemplateOptionsPage(QDesignerFormEditorInterface *core);
 
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 07b973185..32e9bc987 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -182,7 +182,7 @@ void ObjectInspectorTreeView::keyPressEvent(QKeyEvent *event)
 // ------------ ObjectInspectorPrivate
 
 class ObjectInspector::ObjectInspectorPrivate {
-    Q_DISABLE_COPY(ObjectInspectorPrivate)
+    Q_DISABLE_COPY_MOVE(ObjectInspectorPrivate)
 public:
     ObjectInspectorPrivate(QDesignerFormEditorInterface *core);
     ~ObjectInspectorPrivate();
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.h b/src/designer/src/components/propertyeditor/fontpropertymanager.h
index b42667737..13d0e52c7 100644
--- a/src/designer/src/components/propertyeditor/fontpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/fontpropertymanager.h
@@ -50,7 +50,7 @@ namespace qdesigner_internal {
  * contains annotations indicating the platform the font is available on. */
 
 class FontPropertyManager {
-    Q_DISABLE_COPY(FontPropertyManager)
+    Q_DISABLE_COPY_MOVE(FontPropertyManager)
 
 public:
     FontPropertyManager();
diff --git a/src/designer/src/components/propertyeditor/qlonglongvalidator.h b/src/designer/src/components/propertyeditor/qlonglongvalidator.h
index b67482cd2..ccc28b42e 100644
--- a/src/designer/src/components/propertyeditor/qlonglongvalidator.h
+++ b/src/designer/src/components/propertyeditor/qlonglongvalidator.h
@@ -56,7 +56,7 @@ public:
     qlonglong top() const { return t; }
 
 private:
-    Q_DISABLE_COPY(QLongLongValidator)
+    Q_DISABLE_COPY_MOVE(QLongLongValidator)
 
     qlonglong b;
     qlonglong t;
@@ -84,7 +84,7 @@ public:
     qulonglong top() const { return t; }
 
 private:
-    Q_DISABLE_COPY(QULongLongValidator)
+    Q_DISABLE_COPY_MOVE(QULongLongValidator)
 
     qulonglong b;
     qulonglong t;
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h
index d198f524a..994cf3dd7 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.h
+++ b/src/designer/src/components/taskmenu/button_taskmenu.h
@@ -49,7 +49,7 @@ namespace qdesigner_internal {
 class ButtonGroupMenu : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ButtonGroupMenu)
+    Q_DISABLE_COPY_MOVE(ButtonGroupMenu)
 public:
     ButtonGroupMenu(QObject *parent = nullptr);
 
@@ -78,7 +78,7 @@ private:
 class ButtonGroupTaskMenu : public QObject, public QDesignerTaskMenuExtension
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ButtonGroupTaskMenu)
+    Q_DISABLE_COPY_MOVE(ButtonGroupTaskMenu)
     Q_INTERFACES(QDesignerTaskMenuExtension)
 public:
     explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = nullptr);
@@ -96,7 +96,7 @@ private:
 class ButtonTaskMenu: public QDesignerTaskMenu
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ButtonTaskMenu)
+    Q_DISABLE_COPY_MOVE(ButtonTaskMenu)
 public:
     explicit ButtonTaskMenu(QAbstractButton *button, QObject *parent = nullptr);
     ~ButtonTaskMenu() override;
@@ -142,7 +142,7 @@ private:
 class CommandLinkButtonTaskMenu: public ButtonTaskMenu
 {
     Q_OBJECT
-    Q_DISABLE_COPY(CommandLinkButtonTaskMenu)
+    Q_DISABLE_COPY_MOVE(CommandLinkButtonTaskMenu)
 public:
     explicit CommandLinkButtonTaskMenu(QCommandLinkButton *button, QObject *parent = nullptr);
 };
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index 42e3ea1ab..e8df6efe8 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -65,7 +65,7 @@ static const char fontFileKeyC[] = "fontFiles";
 
 class AppFontManager
 {
-    Q_DISABLE_COPY(AppFontManager)
+    Q_DISABLE_COPY_MOVE(AppFontManager)
     AppFontManager();
 public:
     static AppFontManager &instance();
@@ -213,7 +213,7 @@ const AppFontManager::FileNameFontIdPairs &AppFontManager::fonts() const
 
 // ------------- AppFontModel
 class AppFontModel : public QStandardItemModel {
-    Q_DISABLE_COPY(AppFontModel)
+    Q_DISABLE_COPY_MOVE(AppFontModel)
 public:
     AppFontModel(QObject *parent = nullptr);
 
diff --git a/src/designer/src/designer/appfontdialog.h b/src/designer/src/designer/appfontdialog.h
index 959b71a6d..4a5b128af 100644
--- a/src/designer/src/designer/appfontdialog.h
+++ b/src/designer/src/designer/appfontdialog.h
@@ -46,7 +46,7 @@ class QDesignerSettingsInterface;
 
 class AppFontWidget : public QGroupBox
 {
-    Q_DISABLE_COPY(AppFontWidget)
+    Q_DISABLE_COPY_MOVE(AppFontWidget)
     Q_OBJECT
 public:
     explicit AppFontWidget(QWidget *parent = nullptr);
@@ -74,7 +74,7 @@ private:
 
 class AppFontDialog : public QDialog
 {
-    Q_DISABLE_COPY(AppFontDialog)
+    Q_DISABLE_COPY_MOVE(AppFontDialog)
     Q_OBJECT
 public:
     explicit AppFontDialog(QWidget *parent = nullptr);
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index 640730f89..f080b7c90 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -55,7 +55,7 @@ class QMimeData;
 
 class MainWindowBase: public QMainWindow
 {
-    Q_DISABLE_COPY(MainWindowBase)
+    Q_DISABLE_COPY_MOVE(MainWindowBase)
     Q_OBJECT
 protected:
     explicit MainWindowBase(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::Window);
@@ -89,7 +89,7 @@ private:
  * a signal to open a dropped file. */
 class DockedMdiArea : public QMdiArea
 {
-    Q_DISABLE_COPY(DockedMdiArea)
+    Q_DISABLE_COPY_MOVE(DockedMdiArea)
     Q_OBJECT
 public:
     explicit DockedMdiArea(const QString &extension, QWidget *parent = nullptr);
@@ -111,7 +111,7 @@ private:
 class ToolBarManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ToolBarManager)
+    Q_DISABLE_COPY_MOVE(ToolBarManager)
 public:
     explicit ToolBarManager(QMainWindow *configureableMainWindow,
                             QWidget *parent,
@@ -139,7 +139,7 @@ private:
 /* Main window to be used for docked mode */
 class DockedMainWindow : public MainWindowBase {
     Q_OBJECT
-    Q_DISABLE_COPY(DockedMainWindow)
+    Q_DISABLE_COPY_MOVE(DockedMainWindow)
 public:
     typedef QVector<QDesignerToolWindow *> DesignerToolWindowList;
     typedef QVector<QDockWidget *> DockWidgetList;
diff --git a/src/designer/src/designer/newform.h b/src/designer/src/designer/newform.h
index 50b30cbcd..79b99f7c5 100644
--- a/src/designer/src/designer/newform.h
+++ b/src/designer/src/designer/newform.h
@@ -51,7 +51,7 @@ class QIODevice;
 class NewForm: public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(NewForm)
+    Q_DISABLE_COPY_MOVE(NewForm)
 
 public:
     NewForm(QDesignerWorkbench *workbench,
diff --git a/src/designer/src/lib/sdk/abstractdialoggui_p.h b/src/designer/src/lib/sdk/abstractdialoggui_p.h
index 705838982..b9c1814fd 100644
--- a/src/designer/src/lib/sdk/abstractdialoggui_p.h
+++ b/src/designer/src/lib/sdk/abstractdialoggui_p.h
@@ -50,7 +50,7 @@ class QWidget;
 
 class QDESIGNER_SDK_EXPORT QDesignerDialogGuiInterface
 {
-    Q_DISABLE_COPY(QDesignerDialogGuiInterface)
+    Q_DISABLE_COPY_MOVE(QDesignerDialogGuiInterface)
 public:
     QDesignerDialogGuiInterface();
     virtual ~QDesignerDialogGuiInterface();
diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.h b/src/designer/src/lib/sdk/abstractnewformwidget.h
index 8805097bb..35d8efe00 100644
--- a/src/designer/src/lib/sdk/abstractnewformwidget.h
+++ b/src/designer/src/lib/sdk/abstractnewformwidget.h
@@ -39,7 +39,7 @@ class QDesignerFormEditorInterface;
 
 class QDESIGNER_SDK_EXPORT QDesignerNewFormWidgetInterface : public QWidget
 {
-    Q_DISABLE_COPY(QDesignerNewFormWidgetInterface)
+    Q_DISABLE_COPY_MOVE(QDesignerNewFormWidgetInterface)
     Q_OBJECT
 public:
     explicit QDesignerNewFormWidgetInterface(QWidget *parent = nullptr);
diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp
index fc5a42eb0..8c537ab34 100644
--- a/src/designer/src/lib/shared/dialoggui.cpp
+++ b/src/designer/src/lib/shared/dialoggui.cpp
@@ -49,7 +49,7 @@ namespace qdesigner_internal {
 
 // Icon provider that reads out the known image formats
 class IconProvider : public QFileIconProvider {
-    Q_DISABLE_COPY(IconProvider)
+    Q_DISABLE_COPY_MOVE(IconProvider)
 
 public:
     IconProvider();
diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp
index e8948ab6e..cab6bc1cb 100644
--- a/src/designer/src/lib/shared/formlayoutmenu.cpp
+++ b/src/designer/src/lib/shared/formlayoutmenu.cpp
@@ -81,7 +81,7 @@ struct FormLayoutRow {
 // are updated. It also checks the buddy setting depending on whether  the
 // label text contains a buddy marker.
 class FormLayoutRowDialog : public QDialog {
-    Q_DISABLE_COPY(FormLayoutRowDialog)
+    Q_DISABLE_COPY_MOVE(FormLayoutRowDialog)
     Q_OBJECT
 public:
     explicit FormLayoutRowDialog(QDesignerFormEditorInterface *core,
diff --git a/src/designer/src/lib/shared/formlayoutmenu_p.h b/src/designer/src/lib/shared/formlayoutmenu_p.h
index 5d115ead1..e5a197fe0 100644
--- a/src/designer/src/lib/shared/formlayoutmenu_p.h
+++ b/src/designer/src/lib/shared/formlayoutmenu_p.h
@@ -58,7 +58,7 @@ namespace qdesigner_internal {
 // pops up a dialog in which the user can specify label name, text and buddy.
 class QDESIGNER_SHARED_EXPORT FormLayoutMenu : public QObject
 {
-    Q_DISABLE_COPY(FormLayoutMenu)
+    Q_DISABLE_COPY_MOVE(FormLayoutMenu)
     Q_OBJECT
 public:
     typedef QList<QAction *> ActionList;
diff --git a/src/designer/src/lib/shared/iconselector_p.h b/src/designer/src/lib/shared/iconselector_p.h
index 3aed59164..40e38acdd 100644
--- a/src/designer/src/lib/shared/iconselector_p.h
+++ b/src/designer/src/lib/shared/iconselector_p.h
@@ -80,7 +80,7 @@ public:
 private:
     QScopedPointer<class LanguageResourceDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(LanguageResourceDialog)
-    Q_DISABLE_COPY(LanguageResourceDialog)
+    Q_DISABLE_COPY_MOVE(LanguageResourceDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAccepted())
     Q_PRIVATE_SLOT(d_func(), void slotPathChanged(QString))
 
@@ -113,7 +113,7 @@ signals:
 private:
     QScopedPointer<class IconSelectorPrivate> d_ptr;
     Q_DECLARE_PRIVATE(IconSelector)
-    Q_DISABLE_COPY(IconSelector)
+    Q_DISABLE_COPY_MOVE(IconSelector)
 
     Q_PRIVATE_SLOT(d_func(), void slotStateActivated())
     Q_PRIVATE_SLOT(d_func(), void slotSetActivated())
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index 261ddedfe..1a5b71d4a 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -582,7 +582,7 @@ void SplitterLayout::doLayout()
 
 class Grid
 {
-    Q_DISABLE_COPY(Grid);
+    Q_DISABLE_COPY_MOVE(Grid);
 public:
     enum Mode {
         GridLayout, // Arbitrary size/supports span
diff --git a/src/designer/src/lib/shared/layout_p.h b/src/designer/src/lib/shared/layout_p.h
index 8e39de0c0..e6cd69a63 100644
--- a/src/designer/src/lib/shared/layout_p.h
+++ b/src/designer/src/lib/shared/layout_p.h
@@ -60,7 +60,7 @@ namespace qdesigner_internal {
 class QDESIGNER_SHARED_EXPORT Layout : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Layout)
+    Q_DISABLE_COPY_MOVE(Layout)
 protected:
     Layout(const QWidgetList &wl, QWidget *p, QDesignerFormWindowInterface *fw, QWidget *lb, LayoutInfo::Type layoutType);
 
diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp
index a2627ed9a..5df701e98 100644
--- a/src/designer/src/lib/shared/morphmenu.cpp
+++ b/src/designer/src/lib/shared/morphmenu.cpp
@@ -256,7 +256,7 @@ static void replaceWidgetListDynamicProperty(QWidget *parentWidget,
  * which cause other commands to be added. */
 class MorphWidgetCommand : public QDesignerFormWindowCommand
 {
-    Q_DISABLE_COPY(MorphWidgetCommand)
+    Q_DISABLE_COPY_MOVE(MorphWidgetCommand)
 public:
 
     explicit MorphWidgetCommand(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/lib/shared/morphmenu_p.h b/src/designer/src/lib/shared/morphmenu_p.h
index 9e004ebe3..65c533280 100644
--- a/src/designer/src/lib/shared/morphmenu_p.h
+++ b/src/designer/src/lib/shared/morphmenu_p.h
@@ -52,7 +52,7 @@ namespace qdesigner_internal {
 
 /* Conveniene morph menu that acts on a single widget. */
 class QDESIGNER_SHARED_EXPORT MorphMenu : public QObject {
-    Q_DISABLE_COPY(MorphMenu)
+    Q_DISABLE_COPY_MOVE(MorphMenu)
     Q_OBJECT
 public:
     typedef QList<QAction *> ActionList;
diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h
index 293e0c907..0a53f4768 100644
--- a/src/designer/src/lib/shared/newformwidget_p.h
+++ b/src/designer/src/lib/shared/newformwidget_p.h
@@ -68,7 +68,7 @@ class QDesignerWorkbench;
 class QDESIGNER_SHARED_EXPORT NewFormWidget : public QDesignerNewFormWidgetInterface
 {
     Q_OBJECT
-    Q_DISABLE_COPY(NewFormWidget)
+    Q_DISABLE_COPY_MOVE(NewFormWidget)
 
 public:
     typedef QList<qdesigner_internal::DeviceProfile> DeviceProfileList;
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index e57f4da60..c4a3ddd92 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -99,7 +99,7 @@ namespace qdesigner_internal {
  * should return that in its size hint, else such cases won't work */
 
 class DesignerZoomProxyWidget : public ZoomProxyWidget  {
-    Q_DISABLE_COPY(DesignerZoomProxyWidget)
+    Q_DISABLE_COPY_MOVE(DesignerZoomProxyWidget)
 public:
     DesignerZoomProxyWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {});
 protected:
@@ -120,7 +120,7 @@ QSizeF DesignerZoomProxyWidget::sizeHint(Qt::SizeHint which, const QSizeF & cons
 
 // DesignerZoomWidget which returns DesignerZoomProxyWidget in its factory function
 class DesignerZoomWidget : public ZoomWidget {
-    Q_DISABLE_COPY(DesignerZoomWidget)
+    Q_DISABLE_COPY_MOVE(DesignerZoomWidget)
 public:
     DesignerZoomWidget(QWidget *parent = nullptr);
 private:
diff --git a/src/designer/src/lib/shared/qdesigner_command2_p.h b/src/designer/src/lib/shared/qdesigner_command2_p.h
index 8941fbe73..6d5fd00b9 100644
--- a/src/designer/src/lib/shared/qdesigner_command2_p.h
+++ b/src/designer/src/lib/shared/qdesigner_command2_p.h
@@ -59,7 +59,7 @@ class BreakLayoutCommand;
  * QLayoutWidget's. */
 
 class QDESIGNER_SHARED_EXPORT MorphLayoutCommand : public QDesignerFormWindowCommand {
-    Q_DISABLE_COPY(MorphLayoutCommand)
+    Q_DISABLE_COPY_MOVE(MorphLayoutCommand)
 public:
     explicit MorphLayoutCommand(QDesignerFormWindowInterface *formWindow);
     ~MorphLayoutCommand() override;
@@ -83,7 +83,7 @@ private:
 
 // Change the alignment of a widget in a managed grid/box layout cell.
 class LayoutAlignmentCommand : public QDesignerFormWindowCommand {
-    Q_DISABLE_COPY(LayoutAlignmentCommand)
+    Q_DISABLE_COPY_MOVE(LayoutAlignmentCommand)
 public:
     explicit LayoutAlignmentCommand(QDesignerFormWindowInterface *formWindow);
 
diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h
index 2aae590df..abb04368d 100644
--- a/src/designer/src/lib/shared/qdesigner_command_p.h
+++ b/src/designer/src/lib/shared/qdesigner_command_p.h
@@ -346,7 +346,7 @@ private:
 
 // Mixin class for storing the selection state
 class QDESIGNER_SHARED_EXPORT CursorSelectionState {
-    Q_DISABLE_COPY(CursorSelectionState)
+    Q_DISABLE_COPY_MOVE(CursorSelectionState)
 public:
     CursorSelectionState();
 
diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h
index fd5618d7d..917a37159 100644
--- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h
+++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h
@@ -82,7 +82,7 @@ private:
     QWidget *m_decoration;
     QPoint m_hot_spot;
 
-    Q_DISABLE_COPY(QDesignerDnDItem)
+    Q_DISABLE_COPY_MOVE(QDesignerDnDItem)
 };
 
 // Mime data for use with designer drag and drop operations.
diff --git a/src/designer/src/lib/shared/qdesigner_utils_p.h b/src/designer/src/lib/shared/qdesigner_utils_p.h
index e5ad490c8..12374296b 100644
--- a/src/designer/src/lib/shared/qdesigner_utils_p.h
+++ b/src/designer/src/lib/shared/qdesigner_utils_p.h
@@ -453,7 +453,7 @@ QDESIGNER_SHARED_EXPORT QString qtify(const QString &name);
  * which is important to avoid side-effects when putting it into QStackedLayout. */
 
 class QDESIGNER_SHARED_EXPORT UpdateBlocker {
-    Q_DISABLE_COPY(UpdateBlocker)
+    Q_DISABLE_COPY_MOVE(UpdateBlocker)
 
 public:
     UpdateBlocker(QWidget *w);
diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h
index a8a92d227..7b3ed395f 100644
--- a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h
+++ b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h
@@ -67,7 +67,7 @@ namespace qdesigner_internal {
 // shrink them.
 
 class QDESIGNER_SHARED_EXPORT QDesignerWidgetItem : public QObject, public QWidgetItemV2  {
-    Q_DISABLE_COPY(QDesignerWidgetItem)
+    Q_DISABLE_COPY_MOVE(QDesignerWidgetItem)
     Q_OBJECT
 public:
     explicit QDesignerWidgetItem(const QLayout *containingLayout, QWidget *w, Qt::Orientations o = Qt::Horizontal|Qt::Vertical);
@@ -117,7 +117,7 @@ private:
 // instance is in scope.
 
 class QDESIGNER_SHARED_EXPORT QDesignerWidgetItemInstaller {
-    Q_DISABLE_COPY(QDesignerWidgetItemInstaller)
+    Q_DISABLE_COPY_MOVE(QDesignerWidgetItemInstaller)
 
 public:
     QDesignerWidgetItemInstaller();
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog_p.h b/src/designer/src/lib/shared/qtresourceeditordialog_p.h
index e92668eaf..5a6ea9755 100644
--- a/src/designer/src/lib/shared/qtresourceeditordialog_p.h
+++ b/src/designer/src/lib/shared/qtresourceeditordialog_p.h
@@ -73,7 +73,7 @@ private:
 
     QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceEditorDialog)
-    Q_DISABLE_COPY(QtResourceEditorDialog)
+    Q_DISABLE_COPY_MOVE(QtResourceEditorDialog)
 
     Q_PRIVATE_SLOT(d_func(), void slotQrcFileInserted(QtQrcFile *))
     Q_PRIVATE_SLOT(d_func(), void slotQrcFileMoved(QtQrcFile *))
diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp
index d9e078463..86eda0190 100644
--- a/src/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/src/designer/src/lib/shared/qtresourcemodel.cpp
@@ -65,7 +65,7 @@ class QtResourceModelPrivate
 {
     QtResourceModel *q_ptr = nullptr;
     Q_DECLARE_PUBLIC(QtResourceModel)
-    Q_DISABLE_COPY(QtResourceModelPrivate)
+    Q_DISABLE_COPY_MOVE(QtResourceModelPrivate)
 public:
     QtResourceModelPrivate();
     void activate(QtResourceSet *resourceSet, const QStringList &newPaths, int *errorCount = nullptr, QString *errorMessages = nullptr);
diff --git a/src/designer/src/lib/shared/qtresourcemodel_p.h b/src/designer/src/lib/shared/qtresourcemodel_p.h
index c1f1086fd..65d615f52 100644
--- a/src/designer/src/lib/shared/qtresourcemodel_p.h
+++ b/src/designer/src/lib/shared/qtresourcemodel_p.h
@@ -77,7 +77,7 @@ private:
 
     QScopedPointer<class QtResourceSetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceSet)
-    Q_DISABLE_COPY(QtResourceSet)
+    Q_DISABLE_COPY_MOVE(QtResourceSet)
 };
 
 class QDESIGNER_SHARED_EXPORT QtResourceModel : public QObject // one instance per whole designer
@@ -122,7 +122,7 @@ private:
 
     QScopedPointer<class QtResourceModelPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceModel)
-    Q_DISABLE_COPY(QtResourceModel)
+    Q_DISABLE_COPY_MOVE(QtResourceModel)
 
     Q_PRIVATE_SLOT(d_func(), void slotFileChanged(const QString &))
 };
diff --git a/src/designer/src/lib/shared/qtresourceview_p.h b/src/designer/src/lib/shared/qtresourceview_p.h
index dc47b384a..96bc87aee 100644
--- a/src/designer/src/lib/shared/qtresourceview_p.h
+++ b/src/designer/src/lib/shared/qtresourceview_p.h
@@ -91,7 +91,7 @@ private:
 
     QScopedPointer<class QtResourceViewPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceView)
-    Q_DISABLE_COPY(QtResourceView)
+    Q_DISABLE_COPY_MOVE(QtResourceView)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *))
     Q_PRIVATE_SLOT(d_func(), void slotCurrentPathChanged(QTreeWidgetItem *))
     Q_PRIVATE_SLOT(d_func(), void slotCurrentResourceChanged(QListWidgetItem *))
@@ -121,7 +121,7 @@ public:
 private:
     QScopedPointer<class QtResourceViewDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtResourceViewDialog)
-    Q_DISABLE_COPY(QtResourceViewDialog)
+    Q_DISABLE_COPY_MOVE(QtResourceViewDialog)
     Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &))
 };
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index 9c6453516..f9d59c3df 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -255,7 +255,7 @@ QVariant ZoomProxyWidget::itemChange(GraphicsItemChange change, const QVariant &
 static const char *zoomedEventFilterRedirectorNameC = "__qt_ZoomedEventFilterRedirector";
 
 class ZoomedEventFilterRedirector : public QObject {
-    Q_DISABLE_COPY(ZoomedEventFilterRedirector)
+    Q_DISABLE_COPY_MOVE(ZoomedEventFilterRedirector)
 
 public:
     explicit ZoomedEventFilterRedirector(ZoomWidget *zw, QObject *parent);
diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h
index f6085f28d..1c4988eb3 100644
--- a/src/designer/src/lib/shared/zoomwidget_p.h
+++ b/src/designer/src/lib/shared/zoomwidget_p.h
@@ -59,7 +59,7 @@ namespace qdesigner_internal {
 
 class QDESIGNER_SHARED_EXPORT ZoomMenu : public QObject {
     Q_OBJECT
-    Q_DISABLE_COPY(ZoomMenu)
+    Q_DISABLE_COPY_MOVE(ZoomMenu)
 
 public:
     ZoomMenu(QObject *parent = nullptr);
@@ -92,7 +92,7 @@ class QDESIGNER_SHARED_EXPORT ZoomView : public QGraphicsView
     Q_PROPERTY(int zoom READ zoom WRITE setZoom DESIGNABLE true SCRIPTABLE true)
     Q_PROPERTY(bool zoomContextMenuEnabled READ isZoomContextMenuEnabled WRITE setZoomContextMenuEnabled DESIGNABLE true SCRIPTABLE true)
     Q_OBJECT
-    Q_DISABLE_COPY(ZoomView)
+    Q_DISABLE_COPY_MOVE(ZoomView)
 public:
     ZoomView(QWidget *parent = nullptr);
 
@@ -138,7 +138,7 @@ private:
  * This behaviour is required for Windows only. */
 
 class  QDESIGNER_SHARED_EXPORT ZoomProxyWidget : public QGraphicsProxyWidget {
-    Q_DISABLE_COPY(ZoomProxyWidget)
+    Q_DISABLE_COPY_MOVE(ZoomProxyWidget)
 public:
     explicit ZoomProxyWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {});
 
@@ -160,7 +160,7 @@ class QDESIGNER_SHARED_EXPORT ZoomWidget : public ZoomView
     Q_PROPERTY(bool widgetZoomContextMenuEnabled READ isWidgetZoomContextMenuEnabled WRITE setWidgetZoomContextMenuEnabled DESIGNABLE true SCRIPTABLE true)
     Q_PROPERTY(bool itemAcceptDrops READ itemAcceptDrops WRITE setItemAcceptDrops DESIGNABLE true SCRIPTABLE true)
     Q_OBJECT
-    Q_DISABLE_COPY(ZoomWidget)
+    Q_DISABLE_COPY_MOVE(ZoomWidget)
 
 public:
     ZoomWidget(QWidget *parent = nullptr);
diff --git a/src/designer/src/lib/uilib/ui4_p.h b/src/designer/src/lib/uilib/ui4_p.h
index 7ca311ca4..d1ed64b61 100644
--- a/src/designer/src/lib/uilib/ui4_p.h
+++ b/src/designer/src/lib/uilib/ui4_p.h
@@ -162,7 +162,7 @@ class DomStringPropertySpecification;
 */
 
 class QDESIGNER_UILIB_EXPORT DomUI {
-    Q_DISABLE_COPY(DomUI)
+    Q_DISABLE_COPY_MOVE(DomUI)
 public:
     DomUI() = default;
     ~DomUI();
@@ -353,7 +353,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomIncludes {
-    Q_DISABLE_COPY(DomIncludes)
+    Q_DISABLE_COPY_MOVE(DomIncludes)
 public:
     DomIncludes() = default;
     ~DomIncludes();
@@ -377,7 +377,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomInclude {
-    Q_DISABLE_COPY(DomInclude)
+    Q_DISABLE_COPY_MOVE(DomInclude)
 public:
     DomInclude() = default;
     ~DomInclude();
@@ -411,7 +411,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomResources {
-    Q_DISABLE_COPY(DomResources)
+    Q_DISABLE_COPY_MOVE(DomResources)
 public:
     DomResources() = default;
     ~DomResources();
@@ -444,7 +444,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomResource {
-    Q_DISABLE_COPY(DomResource)
+    Q_DISABLE_COPY_MOVE(DomResource)
 public:
     DomResource() = default;
     ~DomResource();
@@ -465,7 +465,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomActionGroup {
-    Q_DISABLE_COPY(DomActionGroup)
+    Q_DISABLE_COPY_MOVE(DomActionGroup)
 public:
     DomActionGroup() = default;
     ~DomActionGroup();
@@ -513,7 +513,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomAction {
-    Q_DISABLE_COPY(DomAction)
+    Q_DISABLE_COPY_MOVE(DomAction)
 public:
     DomAction() = default;
     ~DomAction();
@@ -559,7 +559,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomActionRef {
-    Q_DISABLE_COPY(DomActionRef)
+    Q_DISABLE_COPY_MOVE(DomActionRef)
 public:
     DomActionRef() = default;
     ~DomActionRef();
@@ -580,7 +580,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomButtonGroup {
-    Q_DISABLE_COPY(DomButtonGroup)
+    Q_DISABLE_COPY_MOVE(DomButtonGroup)
 public:
     DomButtonGroup() = default;
     ~DomButtonGroup();
@@ -618,7 +618,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomButtonGroups {
-    Q_DISABLE_COPY(DomButtonGroups)
+    Q_DISABLE_COPY_MOVE(DomButtonGroups)
 public:
     DomButtonGroups() = default;
     ~DomButtonGroups();
@@ -642,7 +642,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomCustomWidgets {
-    Q_DISABLE_COPY(DomCustomWidgets)
+    Q_DISABLE_COPY_MOVE(DomCustomWidgets)
 public:
     DomCustomWidgets() = default;
     ~DomCustomWidgets();
@@ -666,7 +666,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomHeader {
-    Q_DISABLE_COPY(DomHeader)
+    Q_DISABLE_COPY_MOVE(DomHeader)
 public:
     DomHeader() = default;
     ~DomHeader();
@@ -692,7 +692,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomCustomWidget {
-    Q_DISABLE_COPY(DomCustomWidget)
+    Q_DISABLE_COPY_MOVE(DomCustomWidget)
 public:
     DomCustomWidget() = default;
     ~DomCustomWidget();
@@ -778,7 +778,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomLayoutDefault {
-    Q_DISABLE_COPY(DomLayoutDefault)
+    Q_DISABLE_COPY_MOVE(DomLayoutDefault)
 public:
     DomLayoutDefault() = default;
     ~DomLayoutDefault();
@@ -807,7 +807,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomLayoutFunction {
-    Q_DISABLE_COPY(DomLayoutFunction)
+    Q_DISABLE_COPY_MOVE(DomLayoutFunction)
 public:
     DomLayoutFunction() = default;
     ~DomLayoutFunction();
@@ -836,7 +836,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomTabStops {
-    Q_DISABLE_COPY(DomTabStops)
+    Q_DISABLE_COPY_MOVE(DomTabStops)
 public:
     DomTabStops() = default;
     ~DomTabStops();
@@ -860,7 +860,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomLayout {
-    Q_DISABLE_COPY(DomLayout)
+    Q_DISABLE_COPY_MOVE(DomLayout)
 public:
     DomLayout() = default;
     ~DomLayout();
@@ -951,7 +951,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomLayoutItem {
-    Q_DISABLE_COPY(DomLayoutItem)
+    Q_DISABLE_COPY_MOVE(DomLayoutItem)
 public:
     DomLayoutItem() = default;
     ~DomLayoutItem();
@@ -1028,7 +1028,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomRow {
-    Q_DISABLE_COPY(DomRow)
+    Q_DISABLE_COPY_MOVE(DomRow)
 public:
     DomRow() = default;
     ~DomRow();
@@ -1052,7 +1052,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomColumn {
-    Q_DISABLE_COPY(DomColumn)
+    Q_DISABLE_COPY_MOVE(DomColumn)
 public:
     DomColumn() = default;
     ~DomColumn();
@@ -1076,7 +1076,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomItem {
-    Q_DISABLE_COPY(DomItem)
+    Q_DISABLE_COPY_MOVE(DomItem)
 public:
     DomItem() = default;
     ~DomItem();
@@ -1122,7 +1122,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomWidget {
-    Q_DISABLE_COPY(DomWidget)
+    Q_DISABLE_COPY_MOVE(DomWidget)
 public:
     DomWidget() = default;
     ~DomWidget();
@@ -1226,7 +1226,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomSpacer {
-    Q_DISABLE_COPY(DomSpacer)
+    Q_DISABLE_COPY_MOVE(DomSpacer)
 public:
     DomSpacer() = default;
     ~DomSpacer();
@@ -1259,7 +1259,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomColor {
-    Q_DISABLE_COPY(DomColor)
+    Q_DISABLE_COPY_MOVE(DomColor)
 public:
     DomColor() = default;
     ~DomColor();
@@ -1308,7 +1308,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomGradientStop {
-    Q_DISABLE_COPY(DomGradientStop)
+    Q_DISABLE_COPY_MOVE(DomGradientStop)
 public:
     DomGradientStop() = default;
     ~DomGradientStop();
@@ -1344,7 +1344,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomGradient {
-    Q_DISABLE_COPY(DomGradient)
+    Q_DISABLE_COPY_MOVE(DomGradient)
 public:
     DomGradient() = default;
     ~DomGradient();
@@ -1473,7 +1473,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomBrush {
-    Q_DISABLE_COPY(DomBrush)
+    Q_DISABLE_COPY_MOVE(DomBrush)
 public:
     DomBrush() = default;
     ~DomBrush();
@@ -1518,7 +1518,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomColorRole {
-    Q_DISABLE_COPY(DomColorRole)
+    Q_DISABLE_COPY_MOVE(DomColorRole)
 public:
     DomColorRole() = default;
     ~DomColorRole();
@@ -1554,7 +1554,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomColorGroup {
-    Q_DISABLE_COPY(DomColorGroup)
+    Q_DISABLE_COPY_MOVE(DomColorGroup)
 public:
     DomColorGroup() = default;
     ~DomColorGroup();
@@ -1583,7 +1583,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomPalette {
-    Q_DISABLE_COPY(DomPalette)
+    Q_DISABLE_COPY_MOVE(DomPalette)
 public:
     DomPalette() = default;
     ~DomPalette();
@@ -1626,7 +1626,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomFont {
-    Q_DISABLE_COPY(DomFont)
+    Q_DISABLE_COPY_MOVE(DomFont)
 public:
     DomFont() = default;
     ~DomFont();
@@ -1715,7 +1715,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomPoint {
-    Q_DISABLE_COPY(DomPoint)
+    Q_DISABLE_COPY_MOVE(DomPoint)
 public:
     DomPoint() = default;
     ~DomPoint();
@@ -1748,7 +1748,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomRect {
-    Q_DISABLE_COPY(DomRect)
+    Q_DISABLE_COPY_MOVE(DomRect)
 public:
     DomRect() = default;
     ~DomRect();
@@ -1795,7 +1795,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomLocale {
-    Q_DISABLE_COPY(DomLocale)
+    Q_DISABLE_COPY_MOVE(DomLocale)
 public:
     DomLocale() = default;
     ~DomLocale();
@@ -1824,7 +1824,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomSizePolicy {
-    Q_DISABLE_COPY(DomSizePolicy)
+    Q_DISABLE_COPY_MOVE(DomSizePolicy)
 public:
     DomSizePolicy() = default;
     ~DomSizePolicy();
@@ -1888,7 +1888,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomSize {
-    Q_DISABLE_COPY(DomSize)
+    Q_DISABLE_COPY_MOVE(DomSize)
 public:
     DomSize() = default;
     ~DomSize();
@@ -1921,7 +1921,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomDate {
-    Q_DISABLE_COPY(DomDate)
+    Q_DISABLE_COPY_MOVE(DomDate)
 public:
     DomDate() = default;
     ~DomDate();
@@ -1961,7 +1961,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomTime {
-    Q_DISABLE_COPY(DomTime)
+    Q_DISABLE_COPY_MOVE(DomTime)
 public:
     DomTime() = default;
     ~DomTime();
@@ -2001,7 +2001,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomDateTime {
-    Q_DISABLE_COPY(DomDateTime)
+    Q_DISABLE_COPY_MOVE(DomDateTime)
 public:
     DomDateTime() = default;
     ~DomDateTime();
@@ -2062,7 +2062,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomStringList {
-    Q_DISABLE_COPY(DomStringList)
+    Q_DISABLE_COPY_MOVE(DomStringList)
 public:
     DomStringList() = default;
     ~DomStringList();
@@ -2119,7 +2119,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomResourcePixmap {
-    Q_DISABLE_COPY(DomResourcePixmap)
+    Q_DISABLE_COPY_MOVE(DomResourcePixmap)
 public:
     DomResourcePixmap() = default;
     ~DomResourcePixmap();
@@ -2153,7 +2153,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomResourceIcon {
-    Q_DISABLE_COPY(DomResourceIcon)
+    Q_DISABLE_COPY_MOVE(DomResourceIcon)
 public:
     DomResourceIcon() = default;
     ~DomResourceIcon();
@@ -2258,7 +2258,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomString {
-    Q_DISABLE_COPY(DomString)
+    Q_DISABLE_COPY_MOVE(DomString)
 public:
     DomString() = default;
     ~DomString();
@@ -2308,7 +2308,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomPointF {
-    Q_DISABLE_COPY(DomPointF)
+    Q_DISABLE_COPY_MOVE(DomPointF)
 public:
     DomPointF() = default;
     ~DomPointF();
@@ -2341,7 +2341,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomRectF {
-    Q_DISABLE_COPY(DomRectF)
+    Q_DISABLE_COPY_MOVE(DomRectF)
 public:
     DomRectF() = default;
     ~DomRectF();
@@ -2388,7 +2388,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomSizeF {
-    Q_DISABLE_COPY(DomSizeF)
+    Q_DISABLE_COPY_MOVE(DomSizeF)
 public:
     DomSizeF() = default;
     ~DomSizeF();
@@ -2421,7 +2421,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomChar {
-    Q_DISABLE_COPY(DomChar)
+    Q_DISABLE_COPY_MOVE(DomChar)
 public:
     DomChar() = default;
     ~DomChar();
@@ -2447,7 +2447,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomUrl {
-    Q_DISABLE_COPY(DomUrl)
+    Q_DISABLE_COPY_MOVE(DomUrl)
 public:
     DomUrl() = default;
     ~DomUrl();
@@ -2474,7 +2474,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomProperty {
-    Q_DISABLE_COPY(DomProperty)
+    Q_DISABLE_COPY_MOVE(DomProperty)
 public:
     DomProperty() = default;
     ~DomProperty();
@@ -2665,7 +2665,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomConnections {
-    Q_DISABLE_COPY(DomConnections)
+    Q_DISABLE_COPY_MOVE(DomConnections)
 public:
     DomConnections() = default;
     ~DomConnections();
@@ -2689,7 +2689,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomConnection {
-    Q_DISABLE_COPY(DomConnection)
+    Q_DISABLE_COPY_MOVE(DomConnection)
 public:
     DomConnection() = default;
     ~DomConnection();
@@ -2744,7 +2744,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomConnectionHints {
-    Q_DISABLE_COPY(DomConnectionHints)
+    Q_DISABLE_COPY_MOVE(DomConnectionHints)
 public:
     DomConnectionHints() = default;
     ~DomConnectionHints();
@@ -2768,7 +2768,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomConnectionHint {
-    Q_DISABLE_COPY(DomConnectionHint)
+    Q_DISABLE_COPY_MOVE(DomConnectionHint)
 public:
     DomConnectionHint() = default;
     ~DomConnectionHint();
@@ -2810,7 +2810,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomDesignerData {
-    Q_DISABLE_COPY(DomDesignerData)
+    Q_DISABLE_COPY_MOVE(DomDesignerData)
 public:
     DomDesignerData() = default;
     ~DomDesignerData();
@@ -2834,7 +2834,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomSlots {
-    Q_DISABLE_COPY(DomSlots)
+    Q_DISABLE_COPY_MOVE(DomSlots)
 public:
     DomSlots() = default;
     ~DomSlots();
@@ -2863,7 +2863,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomPropertySpecifications {
-    Q_DISABLE_COPY(DomPropertySpecifications)
+    Q_DISABLE_COPY_MOVE(DomPropertySpecifications)
 public:
     DomPropertySpecifications() = default;
     ~DomPropertySpecifications();
@@ -2892,7 +2892,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomPropertyToolTip {
-    Q_DISABLE_COPY(DomPropertyToolTip)
+    Q_DISABLE_COPY_MOVE(DomPropertyToolTip)
 public:
     DomPropertyToolTip() = default;
     ~DomPropertyToolTip();
@@ -2913,7 +2913,7 @@ private:
 };
 
 class QDESIGNER_UILIB_EXPORT DomStringPropertySpecification {
-    Q_DISABLE_COPY(DomStringPropertySpecification)
+    Q_DISABLE_COPY_MOVE(DomStringPropertySpecification)
 public:
     DomStringPropertySpecification() = default;
     ~DomStringPropertySpecification();
diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
index 3344e49e5..3c15763da 100644
--- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
+++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
@@ -53,7 +53,7 @@ class QDesignerAxWidget : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(QString control READ control WRITE setControl RESET resetControl DESIGNABLE true)
-    Q_DISABLE_COPY(QDesignerAxWidget)
+    Q_DISABLE_COPY_MOVE(QDesignerAxWidget)
 
 protected:
     explicit QDesignerAxWidget(QWidget *parent);
diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h
index fb77993c0..82a01210b 100644
--- a/src/designer/src/uitools/quiloader.h
+++ b/src/designer/src/uitools/quiloader.h
@@ -99,7 +99,7 @@ public:
 private:
     QScopedPointer<QUiLoaderPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QUiLoader)
-    Q_DISABLE_COPY(QUiLoader)
+    Q_DISABLE_COPY_MOVE(QUiLoader)
 };
 
 QT_END_NAMESPACE
diff --git a/src/shared/qtgradienteditor/qtcolorbutton.h b/src/shared/qtgradienteditor/qtcolorbutton.h
index 8684c41a9..65aa67701 100644
--- a/src/shared/qtgradienteditor/qtcolorbutton.h
+++ b/src/shared/qtgradienteditor/qtcolorbutton.h
@@ -75,7 +75,7 @@ protected:
 private:
     QScopedPointer<class QtColorButtonPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorButton)
-    Q_DISABLE_COPY(QtColorButton)
+    Q_DISABLE_COPY_MOVE(QtColorButton)
     Q_PRIVATE_SLOT(d_func(), void slotEditColor())
 };
 
diff --git a/src/shared/qtgradienteditor/qtcolorline.h b/src/shared/qtgradienteditor/qtcolorline.h
index 6d19ed4d9..8a9aec90c 100644
--- a/src/shared/qtgradienteditor/qtcolorline.h
+++ b/src/shared/qtgradienteditor/qtcolorline.h
@@ -114,7 +114,7 @@ private:
 
     QScopedPointer<class QtColorLinePrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorLine)
-    Q_DISABLE_COPY(QtColorLine)
+    Q_DISABLE_COPY_MOVE(QtColorLine)
 };
 
 QT_END_NAMESPACE
diff --git a/src/shared/qtgradienteditor/qtgradientdialog.h b/src/shared/qtgradienteditor/qtgradientdialog.h
index d263ef066..852c3a143 100644
--- a/src/shared/qtgradienteditor/qtgradientdialog.h
+++ b/src/shared/qtgradienteditor/qtgradientdialog.h
@@ -76,7 +76,7 @@ public:
 private:
     QScopedPointer<class QtGradientDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientDialog)
-    Q_DISABLE_COPY(QtGradientDialog)
+    Q_DISABLE_COPY_MOVE(QtGradientDialog)
     Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint))
 };
 
diff --git a/src/shared/qtgradienteditor/qtgradienteditor.h b/src/shared/qtgradienteditor/qtgradienteditor.h
index ace096d4e..5d91fb0d4 100644
--- a/src/shared/qtgradienteditor/qtgradienteditor.h
+++ b/src/shared/qtgradienteditor/qtgradienteditor.h
@@ -78,7 +78,7 @@ signals:
 private:
     QScopedPointer<class QtGradientEditorPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientEditor)
-    Q_DISABLE_COPY(QtGradientEditor)
+    Q_DISABLE_COPY_MOVE(QtGradientEditor)
     Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops))
     Q_PRIVATE_SLOT(d_func(), void slotTypeChanged(int type))
     Q_PRIVATE_SLOT(d_func(), void slotSpreadChanged(int type))
diff --git a/src/shared/qtgradienteditor/qtgradientstopscontroller.h b/src/shared/qtgradienteditor/qtgradientstopscontroller.h
index 86e1ac00a..1b3bbd391 100644
--- a/src/shared/qtgradienteditor/qtgradientstopscontroller.h
+++ b/src/shared/qtgradienteditor/qtgradientstopscontroller.h
@@ -70,7 +70,7 @@ signals:
 private:
     QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientStopsController)
-    Q_DISABLE_COPY(QtGradientStopsController)
+    Q_DISABLE_COPY_MOVE(QtGradientStopsController)
     Q_PRIVATE_SLOT(d_func(), void slotHsvClicked())
     Q_PRIVATE_SLOT(d_func(), void slotRgbClicked())
     Q_PRIVATE_SLOT(d_func(), void slotCurrentStopChanged(QtGradientStop *stop))
diff --git a/src/shared/qtgradienteditor/qtgradientstopsmodel.h b/src/shared/qtgradienteditor/qtgradientstopsmodel.h
index 121417813..71a8783e0 100644
--- a/src/shared/qtgradienteditor/qtgradientstopsmodel.h
+++ b/src/shared/qtgradienteditor/qtgradientstopsmodel.h
@@ -111,7 +111,7 @@ signals:
 private:
     QScopedPointer<class QtGradientStopsModelPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientStopsModel)
-    Q_DISABLE_COPY(QtGradientStopsModel)
+    Q_DISABLE_COPY_MOVE(QtGradientStopsModel)
 };
 
 QT_END_NAMESPACE
diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.h b/src/shared/qtgradienteditor/qtgradientstopswidget.h
index 841ff43e6..d3593ae81 100644
--- a/src/shared/qtgradienteditor/qtgradientstopswidget.h
+++ b/src/shared/qtgradienteditor/qtgradientstopswidget.h
@@ -91,7 +91,7 @@ protected:
 private:
     QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientStopsWidget)
-    Q_DISABLE_COPY(QtGradientStopsWidget)
+    Q_DISABLE_COPY_MOVE(QtGradientStopsWidget)
     Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop))
     Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop))
     Q_PRIVATE_SLOT(d_func(), void slotStopMoved(QtGradientStop *stop, qreal newPos))
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.h b/src/shared/qtgradienteditor/qtgradientwidget.h
index 4ac3da8fb..2c701b28c 100644
--- a/src/shared/qtgradienteditor/qtgradientwidget.h
+++ b/src/shared/qtgradienteditor/qtgradientwidget.h
@@ -110,7 +110,7 @@ protected:
 private:
     QScopedPointer<class QtGradientWidgetPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGradientWidget)
-    Q_DISABLE_COPY(QtGradientWidget)
+    Q_DISABLE_COPY_MOVE(QtGradientWidget)
 };
 
 QT_END_NAMESPACE
diff --git a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
index 18b76b96f..d97613153 100644
--- a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
@@ -71,7 +71,7 @@ private:
 
     QScopedPointer<QtButtonPropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtButtonPropertyBrowser)
-    Q_DISABLE_COPY(QtButtonPropertyBrowser)
+    Q_DISABLE_COPY_MOVE(QtButtonPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotUpdate())
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed())
     Q_PRIVATE_SLOT(d_func(), void slotToggled(bool))
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.h b/src/shared/qtpropertybrowser/qteditorfactory.h
index b53669e2d..0bdc07cc4 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.h
+++ b/src/shared/qtpropertybrowser/qteditorfactory.h
@@ -60,7 +60,7 @@ protected:
 private:
     QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSpinBoxFactory)
-    Q_DISABLE_COPY(QtSpinBoxFactory)
+    Q_DISABLE_COPY_MOVE(QtSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
     Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int))
@@ -84,7 +84,7 @@ protected:
 private:
     QScopedPointer<QtSliderFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSliderFactory)
-    Q_DISABLE_COPY(QtSliderFactory)
+    Q_DISABLE_COPY_MOVE(QtSliderFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
     Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int))
@@ -108,7 +108,7 @@ protected:
 private:
     QScopedPointer<QtScrollBarFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtScrollBarFactory)
-    Q_DISABLE_COPY(QtScrollBarFactory)
+    Q_DISABLE_COPY_MOVE(QtScrollBarFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
     Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int))
@@ -132,7 +132,7 @@ protected:
 private:
     QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCheckBoxFactory)
-    Q_DISABLE_COPY(QtCheckBoxFactory)
+    Q_DISABLE_COPY_MOVE(QtCheckBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -154,7 +154,7 @@ protected:
 private:
     QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory)
-    Q_DISABLE_COPY(QtDoubleSpinBoxFactory)
+    Q_DISABLE_COPY_MOVE(QtDoubleSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double))
     Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double))
@@ -179,7 +179,7 @@ protected:
 private:
     QScopedPointer<QtLineEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtLineEditFactory)
-    Q_DISABLE_COPY(QtLineEditFactory)
+    Q_DISABLE_COPY_MOVE(QtLineEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &))
     Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &))
@@ -202,7 +202,7 @@ protected:
 private:
     QScopedPointer<QtDateEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateEditFactory)
-    Q_DISABLE_COPY(QtDateEditFactory)
+    Q_DISABLE_COPY_MOVE(QtDateEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *,
                         const QDate &, const QDate &))
@@ -226,7 +226,7 @@ protected:
 private:
     QScopedPointer<QtTimeEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTimeEditFactory)
-    Q_DISABLE_COPY(QtTimeEditFactory)
+    Q_DISABLE_COPY_MOVE(QtTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -248,7 +248,7 @@ protected:
 private:
     QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateTimeEditFactory)
-    Q_DISABLE_COPY(QtDateTimeEditFactory)
+    Q_DISABLE_COPY_MOVE(QtDateTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -270,7 +270,7 @@ protected:
 private:
     QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory)
-    Q_DISABLE_COPY(QtKeySequenceEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtKeySequenceEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -292,7 +292,7 @@ protected:
 private:
     QScopedPointer<QtCharEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCharEditorFactory)
-    Q_DISABLE_COPY(QtCharEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtCharEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -314,7 +314,7 @@ protected:
 private:
     QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtEnumEditorFactory)
-    Q_DISABLE_COPY(QtEnumEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtEnumEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *,
                         const QStringList &))
@@ -340,7 +340,7 @@ protected:
 private:
     QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCursorEditorFactory)
-    Q_DISABLE_COPY(QtCursorEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtCursorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -362,7 +362,7 @@ protected:
 private:
     QScopedPointer<QtColorEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorEditorFactory)
-    Q_DISABLE_COPY(QtColorEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtColorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &))
@@ -384,7 +384,7 @@ protected:
 private:
     QScopedPointer<QtFontEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFontEditorFactory)
-    Q_DISABLE_COPY(QtFontEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtFontEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &))
diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
index bfc81e032..bb44a01b5 100644
--- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
@@ -63,7 +63,7 @@ private:
 
     QScopedPointer<QtGroupBoxPropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser)
-    Q_DISABLE_COPY(QtGroupBoxPropertyBrowser)
+    Q_DISABLE_COPY_MOVE(QtGroupBoxPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotUpdate())
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed())
 
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.h b/src/shared/qtpropertybrowser/qtpropertybrowser.h
index 8a1b63521..f85d622da 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -122,7 +122,7 @@ private:
     friend class QtProperty;
     QScopedPointer<QtAbstractPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtAbstractPropertyManager)
-    Q_DISABLE_COPY(QtAbstractPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtAbstractPropertyManager)
 };
 
 class QtAbstractEditorFactoryBase : public QObject
@@ -288,7 +288,7 @@ private:
 
     QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser)
-    Q_DISABLE_COPY(QtAbstractPropertyBrowser)
+    Q_DISABLE_COPY_MOVE(QtAbstractPropertyBrowser)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *,
                             QtProperty *, QtProperty *))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *,
diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.h b/src/shared/qtpropertybrowser/qtpropertymanager.h
index 4298c4418..4ec80f821 100644
--- a/src/shared/qtpropertybrowser/qtpropertymanager.h
+++ b/src/shared/qtpropertybrowser/qtpropertymanager.h
@@ -94,7 +94,7 @@ protected:
 private:
     QScopedPointer<QtIntPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtIntPropertyManager)
-    Q_DISABLE_COPY(QtIntPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtIntPropertyManager)
 };
 
 class QtBoolPropertyManagerPrivate;
@@ -120,7 +120,7 @@ protected:
 private:
     QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtBoolPropertyManager)
-    Q_DISABLE_COPY(QtBoolPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtBoolPropertyManager)
 };
 
 class QtDoublePropertyManagerPrivate;
@@ -157,7 +157,7 @@ protected:
 private:
     QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDoublePropertyManager)
-    Q_DISABLE_COPY(QtDoublePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtDoublePropertyManager)
 };
 
 class QtStringPropertyManagerPrivate;
@@ -185,7 +185,7 @@ protected:
 private:
     QScopedPointer<QtStringPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtStringPropertyManager)
-    Q_DISABLE_COPY(QtStringPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtStringPropertyManager)
 };
 
 class QtDatePropertyManagerPrivate;
@@ -216,7 +216,7 @@ protected:
 private:
     QScopedPointer<QtDatePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDatePropertyManager)
-    Q_DISABLE_COPY(QtDatePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtDatePropertyManager)
 };
 
 class QtTimePropertyManagerPrivate;
@@ -241,7 +241,7 @@ protected:
 private:
     QScopedPointer<QtTimePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTimePropertyManager)
-    Q_DISABLE_COPY(QtTimePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtTimePropertyManager)
 };
 
 class QtDateTimePropertyManagerPrivate;
@@ -266,7 +266,7 @@ protected:
 private:
     QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtDateTimePropertyManager)
-    Q_DISABLE_COPY(QtDateTimePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtDateTimePropertyManager)
 };
 
 class QtKeySequencePropertyManagerPrivate;
@@ -291,7 +291,7 @@ protected:
 private:
     QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtKeySequencePropertyManager)
-    Q_DISABLE_COPY(QtKeySequencePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtKeySequencePropertyManager)
 };
 
 class QtCharPropertyManagerPrivate;
@@ -316,7 +316,7 @@ protected:
 private:
     QScopedPointer<QtCharPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCharPropertyManager)
-    Q_DISABLE_COPY(QtCharPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtCharPropertyManager)
 };
 
 class QtEnumPropertyManager;
@@ -344,7 +344,7 @@ protected:
 private:
     QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtLocalePropertyManager)
-    Q_DISABLE_COPY(QtLocalePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtLocalePropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -373,7 +373,7 @@ protected:
 private:
     QScopedPointer<QtPointPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtPointPropertyManager)
-    Q_DISABLE_COPY(QtPointPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtPointPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -405,7 +405,7 @@ protected:
 private:
     QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtPointFPropertyManager)
-    Q_DISABLE_COPY(QtPointFPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtPointFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -440,7 +440,7 @@ protected:
 private:
     QScopedPointer<QtSizePropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizePropertyManager)
-    Q_DISABLE_COPY(QtSizePropertyManager)
+    Q_DISABLE_COPY_MOVE(QtSizePropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -478,7 +478,7 @@ protected:
 private:
     QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizeFPropertyManager)
-    Q_DISABLE_COPY(QtSizeFPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtSizeFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -510,7 +510,7 @@ protected:
 private:
     QScopedPointer<QtRectPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtRectPropertyManager)
-    Q_DISABLE_COPY(QtRectPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtRectPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -545,7 +545,7 @@ protected:
 private:
     QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtRectFPropertyManager)
-    Q_DISABLE_COPY(QtRectFPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtRectFPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -579,7 +579,7 @@ protected:
 private:
     QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtEnumPropertyManager)
-    Q_DISABLE_COPY(QtEnumPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtEnumPropertyManager)
 };
 
 class QtFlagPropertyManagerPrivate;
@@ -609,7 +609,7 @@ protected:
 private:
     QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFlagPropertyManager)
-    Q_DISABLE_COPY(QtFlagPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtFlagPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -639,7 +639,7 @@ protected:
 private:
     QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager)
-    Q_DISABLE_COPY(QtSizePolicyPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtSizePolicyPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
@@ -672,7 +672,7 @@ protected:
 private:
     QScopedPointer<QtFontPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFontPropertyManager)
-    Q_DISABLE_COPY(QtFontPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtFontPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool))
@@ -706,7 +706,7 @@ protected:
 private:
     QScopedPointer<QtColorPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtColorPropertyManager)
-    Q_DISABLE_COPY(QtColorPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtColorPropertyManager)
     Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *))
 };
@@ -736,7 +736,7 @@ protected:
 private:
     QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtCursorPropertyManager)
-    Q_DISABLE_COPY(QtCursorPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtCursorPropertyManager)
 };
 
 QT_END_NAMESPACE
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.h b/src/shared/qtpropertybrowser/qttreepropertybrowser.h
index 9ff4d5f50..e8716c898 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.h
@@ -118,7 +118,7 @@ private:
 
     QScopedPointer<QtTreePropertyBrowserPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtTreePropertyBrowser)
-    Q_DISABLE_COPY(QtTreePropertyBrowser)
+    Q_DISABLE_COPY_MOVE(QtTreePropertyBrowser)
 
     Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &))
     Q_PRIVATE_SLOT(d_func(), void slotExpanded(const QModelIndex &))
diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.h b/src/shared/qtpropertybrowser/qtvariantproperty.h
index 81859c56a..ff5af83e6 100644
--- a/src/shared/qtpropertybrowser/qtvariantproperty.h
+++ b/src/shared/qtpropertybrowser/qtvariantproperty.h
@@ -148,7 +148,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *))
     Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *))
     Q_DECLARE_PRIVATE(QtVariantPropertyManager)
-    Q_DISABLE_COPY(QtVariantPropertyManager)
+    Q_DISABLE_COPY_MOVE(QtVariantPropertyManager)
 };
 
 class QtVariantEditorFactory : public QtAbstractEditorFactory<QtVariantPropertyManager>
@@ -165,7 +165,7 @@ protected:
 private:
     QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtVariantEditorFactory)
-    Q_DISABLE_COPY(QtVariantEditorFactory)
+    Q_DISABLE_COPY_MOVE(QtVariantEditorFactory)
 };
 
 QT_END_NAMESPACE
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index 4df2d00d5..bce8e4345 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -121,7 +121,7 @@ signals:
 private:
     QScopedPointer<QtFullToolBarManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtFullToolBarManager)
-    Q_DISABLE_COPY(QtFullToolBarManager)
+    Q_DISABLE_COPY_MOVE(QtFullToolBarManager)
 };
 
 class QtFullToolBarManagerPrivate
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.h b/src/shared/qttoolbardialog/qttoolbardialog.h
index bd54c01d2..72d34bafb 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.h
+++ b/src/shared/qttoolbardialog/qttoolbardialog.h
@@ -88,7 +88,7 @@ private:
     friend class QtToolBarDialog;
     QScopedPointer<QtToolBarManagerPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtToolBarManager)
-    Q_DISABLE_COPY(QtToolBarManager)
+    Q_DISABLE_COPY_MOVE(QtToolBarManager)
 };
 
 class QtToolBarDialogPrivate;
@@ -112,7 +112,7 @@ private:
 
     QScopedPointer<QtToolBarDialogPrivate> d_ptr;
     Q_DECLARE_PRIVATE(QtToolBarDialog)
-    Q_DISABLE_COPY(QtToolBarDialog)
+    Q_DISABLE_COPY_MOVE(QtToolBarDialog)
 
     Q_PRIVATE_SLOT(d_func(), void newClicked())
     Q_PRIVATE_SLOT(d_func(), void removeClicked())