From a34717dc22dfadc2fbc3b1dc08d7a3a76e799bce Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Wed, 9 Mar 2022 17:38:03 +0100
Subject: [PATCH] Ensure moc sees fully qualified property types

Qt6 insists on that. We can do this either by including the moc files,
or by including the corresponding headers in the header defining the
properties, the former seems cleaner when possible.
---
 src/abstract_client.cpp                                        | 2 ++
 .../kwindecoration/declarative-plugin/previewbutton.cpp        | 2 ++
 .../kwindecoration/declarative-plugin/previewclient.cpp        | 2 ++
 src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp  | 2 ++
 src/kcmkwin/kwindecoration/kcm.cpp                             | 1 +
 src/kcmkwin/kwindesktop/virtualdesktops.cpp                    | 1 +
 src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp         | 1 +
 src/libkwineffects/kwineffects.cpp                             | 2 ++
 src/plugins/kdecorations/aurorae/src/aurorae.cpp               | 1 +
 src/scripting/dbuscall.h                                       | 1 +
 src/scripting/desktopbackgrounditem.cpp                        | 2 ++
 src/scripting/v3/clientmodel.h                                 | 3 ++-
 src/scripting/workspace_wrapper.cpp                            | 2 ++
 src/toplevel.cpp                                               | 1 +
 14 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
index 3ef9321980..2000152e99 100644
--- a/src/abstract_client.cpp
+++ b/src/abstract_client.cpp
@@ -3747,3 +3747,5 @@ bool AbstractClient::wantsShadowToBeRendered() const
 }
 
 }
+
+#include "moc_abstract_client.cpp"
diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp
index 27c0364ec2..1f76207b37 100644
--- a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp
+++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp
@@ -133,3 +133,5 @@ void PreviewButtonItem::setColor(const QColor &color)
 
 }
 }
+
+#include "moc_previewbutton.cpp"
diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
index d5c848cdb7..1a3e4b8913 100644
--- a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
+++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
@@ -455,3 +455,5 @@ SETTER2(setProvidesContextHelp, providesContextHelp)
 
 } // namespace Preview
 } // namespace KDecoration2
+
+#include "moc_previewclient.cpp"
diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp
index ddd8dfc25d..4a39231dce 100644
--- a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp
+++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp
@@ -453,3 +453,5 @@ DecorationShadow *PreviewItem::shadow() const
 
 }
 }
+
+#include "moc_previewitem.cpp"
diff --git a/src/kcmkwin/kwindecoration/kcm.cpp b/src/kcmkwin/kwindecoration/kcm.cpp
index 854cca2f37..cf03c15fca 100644
--- a/src/kcmkwin/kwindecoration/kcm.cpp
+++ b/src/kcmkwin/kwindecoration/kcm.cpp
@@ -260,3 +260,4 @@ QString KCMKWinDecoration::borderSizeIndexToString(int index) const
 }
 
 #include "kcm.moc"
+#include "moc_kcm.cpp"
diff --git a/src/kcmkwin/kwindesktop/virtualdesktops.cpp b/src/kcmkwin/kwindesktop/virtualdesktops.cpp
index cd5b02a0b6..7c5131e803 100644
--- a/src/kcmkwin/kwindesktop/virtualdesktops.cpp
+++ b/src/kcmkwin/kwindesktop/virtualdesktops.cpp
@@ -165,3 +165,4 @@ bool VirtualDesktops::isSaveNeeded() const
 }
 
 #include "virtualdesktops.moc"
+#include "moc_virtualdesktops.cpp"
diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp b/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp
index e1ddbac76b..77f293dcc7 100644
--- a/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp
+++ b/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp
@@ -100,3 +100,4 @@ int VirtualKeyboardsModel::rowCount(const QModelIndex &parent) const
 }
 
 #include "kcmvirtualkeyboard.moc"
+#include "moc_kcmvirtualkeyboard.cpp"
diff --git a/src/libkwineffects/kwineffects.cpp b/src/libkwineffects/kwineffects.cpp
index a038ffa1c2..b21ff118b6 100644
--- a/src/libkwineffects/kwineffects.cpp
+++ b/src/libkwineffects/kwineffects.cpp
@@ -20,6 +20,7 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QtMath>
+#include <QWindow>
 
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
@@ -1767,3 +1768,4 @@ TimeLine &TimeLine::operator=(const TimeLine &other)
 } // namespace
 
 #include "moc_kwinglobals.cpp"
+#include "moc_kwineffects.cpp"
diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
index 00d8bba4a3..9c78bb6bd1 100644
--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
@@ -790,3 +790,4 @@ void ConfigurationModule::initQml()
 }
 
 #include "aurorae.moc"
+#include "moc_aurorae.cpp"
diff --git a/src/scripting/dbuscall.h b/src/scripting/dbuscall.h
index c2fcb26722..0c48e207b3 100644
--- a/src/scripting/dbuscall.h
+++ b/src/scripting/dbuscall.h
@@ -11,6 +11,7 @@
 
 #include <QObject>
 #include <QString>
+#include <QVariant>
 
 namespace KWin
 {
diff --git a/src/scripting/desktopbackgrounditem.cpp b/src/scripting/desktopbackgrounditem.cpp
index de9715ec5c..32885c46a4 100644
--- a/src/scripting/desktopbackgrounditem.cpp
+++ b/src/scripting/desktopbackgrounditem.cpp
@@ -115,3 +115,5 @@ void DesktopBackgroundItem::updateWindow()
 }
 
 } // namespace KWin
+
+#include "moc_desktopbackgrounditem.cpp"
diff --git a/src/scripting/v3/clientmodel.h b/src/scripting/v3/clientmodel.h
index ccb0e4b0f2..daf376e1d5 100644
--- a/src/scripting/v3/clientmodel.h
+++ b/src/scripting/v3/clientmodel.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include "virtualdesktops.h"
+
 #include <QAbstractListModel>
 #include <QPointer>
 #include <QSortFilterProxyModel>
@@ -16,7 +18,6 @@ namespace KWin
 {
 class AbstractClient;
 class AbstractOutput;
-class VirtualDesktop;
 
 namespace ScriptingModels::V3
 {
diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp
index 9544fa3981..014e1015c3 100644
--- a/src/scripting/workspace_wrapper.cpp
+++ b/src/scripting/workspace_wrapper.cpp
@@ -421,3 +421,5 @@ DeclarativeScriptWorkspaceWrapper::DeclarativeScriptWorkspaceWrapper(QObject* pa
     : WorkspaceWrapper(parent) {}
 
 } // KWin
+
+#include "moc_workspace_wrapper.cpp"
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 7119a4fa1f..2db55ee308 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -721,3 +721,4 @@ bool Toplevel::isOnCurrentDesktop() const
 
 } // namespace
 
+#include "moc_toplevel.cpp"