From 5aae8c768aa69344a1d7ff2d9611de0b04acd8e2 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Wed, 9 Mar 2022 17:43:24 +0100
Subject: [PATCH] Port to qmlRegisterAnonymousType()

The anonymous variant of qmlRegisterType() is deprecated in Qt5 and
gone in Qt6.

This however now requires us to specify a module URI and major version
number. I used the names and (lowest) versions used already for other
types nearby where available, and fell back to "org.kde.kwin" and 0
otherwise.
---
 src/kcmkwin/kwindesktop/virtualdesktops.cpp      |  2 +-
 src/kcmkwin/kwintabbox/layoutpreview.cpp         |  2 +-
 src/plugins/kdecorations/aurorae/src/aurorae.cpp |  4 ++--
 src/scripting/scripting.cpp                      | 14 +++++++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/kcmkwin/kwindesktop/virtualdesktops.cpp b/src/kcmkwin/kwindesktop/virtualdesktops.cpp
index 7c5131e803..8d76d7559f 100644
--- a/src/kcmkwin/kwindesktop/virtualdesktops.cpp
+++ b/src/kcmkwin/kwindesktop/virtualdesktops.cpp
@@ -34,7 +34,7 @@ VirtualDesktops::VirtualDesktops(QObject *parent, const QVariantList &args)
         QStringLiteral("2.0"), QString(), KAboutLicense::GPL);
     setAboutData(about);
 
-    qmlRegisterType<VirtualDesktopsSettings>();
+    qmlRegisterAnonymousType<VirtualDesktopsSettings>("org.kde.kwin.kcm.desktop", 0);
 
     setButtons(Apply | Default);
 
diff --git a/src/kcmkwin/kwintabbox/layoutpreview.cpp b/src/kcmkwin/kwintabbox/layoutpreview.cpp
index aa8b6bb83e..1f752565ee 100644
--- a/src/kcmkwin/kwintabbox/layoutpreview.cpp
+++ b/src/kcmkwin/kwintabbox/layoutpreview.cpp
@@ -35,7 +35,7 @@ LayoutPreview::LayoutPreview(const QString &path, bool showDesktopThumbnail, QOb
     qmlRegisterType<SwitcherItem>("org.kde.kwin", 2, 0, "Switcher");
     qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnailItem");
     qmlRegisterType<SwitcherItem>("org.kde.kwin", 3, 0, "TabBoxSwitcher");
-    qmlRegisterType<QAbstractItemModel>();
+    qmlRegisterAnonymousType<QAbstractItemModel>("org.kde.kwin", 2);
     component->loadUrl(QUrl::fromLocalFile(path));
     if (component->isError()) {
         qDebug() << component->errorString();
diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
index 663b0ebffa..e18273afb0 100644
--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
@@ -223,8 +223,8 @@ void Helper::init()
     m_engine->importPlugin(pluginPath, "org.kde.kwin.decoration", nullptr);
     qmlRegisterType<KWin::Borders>("org.kde.kwin.decoration", 0, 1, "Borders");
 
-    qmlRegisterType<KDecoration2::Decoration>();
-    qmlRegisterType<KDecoration2::DecoratedClient>();
+    qmlRegisterAnonymousType<KDecoration2::Decoration>("org.kde.kwin.decoration", 0);
+    qmlRegisterAnonymousType<KDecoration2::DecoratedClient>("org.kde.kwin.decoration", 0);
     qRegisterMetaType<KDecoration2::BorderSize>();
 }
 
diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp
index 0713cfaa76..cc0550478f 100644
--- a/src/scripting/scripting.cpp
+++ b/src/scripting/scripting.cpp
@@ -643,7 +643,7 @@ void KWin::Scripting::init()
     qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 2, 0, "ThumbnailItem");
     qmlRegisterType<DBusCall>("org.kde.kwin", 2, 0, "DBusCall");
     qmlRegisterType<ScreenEdgeItem>("org.kde.kwin", 2, 0, "ScreenEdgeItem");
-    qmlRegisterType<ScriptingModels::V2::ClientModel>();
+    qmlRegisterAnonymousType<ScriptingModels::V2::ClientModel>("org.kde.kwin", 2);
     qmlRegisterType<ScriptingModels::V2::SimpleClientModel>("org.kde.kwin", 2, 0, "ClientModel");
     qmlRegisterType<ScriptingModels::V2::ClientModelByScreen>("org.kde.kwin", 2, 0, "ClientModelByScreen");
     qmlRegisterType<ScriptingModels::V2::ClientModelByScreenAndDesktop>("org.kde.kwin", 2, 0, "ClientModelByScreenAndDesktop");
@@ -665,10 +665,14 @@ void KWin::Scripting::init()
     });
     qmlRegisterSingletonInstance("org.kde.kwin", 3, 0, "Options", options);
 
-    qmlRegisterType<KWin::AbstractClient>();
-    qmlRegisterType<KWin::VirtualDesktop>();
-    qmlRegisterType<KWin::X11Client>();
-    qmlRegisterType<QAbstractItemModel>();
+    qmlRegisterAnonymousType<KWin::AbstractClient>("org.kde.kwin", 2);
+    qmlRegisterAnonymousType<KWin::VirtualDesktop>("org.kde.kwin", 2);
+    qmlRegisterAnonymousType<KWin::X11Client>("org.kde.kwin", 2);
+    qmlRegisterAnonymousType<QAbstractItemModel>("org.kde.kwin", 2);
+    qmlRegisterAnonymousType<KWin::AbstractClient>("org.kde.kwin", 3);
+    qmlRegisterAnonymousType<KWin::VirtualDesktop>("org.kde.kwin", 3);
+    qmlRegisterAnonymousType<KWin::X11Client>("org.kde.kwin", 3);
+    qmlRegisterAnonymousType<QAbstractItemModel>("org.kde.kwin", 3);
 
     // TODO Plasma 6: Drop context properties.
     m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("workspace"), m_workspaceWrapper);