From 504256ba528a68403f2132253041ab3d94beeb3a Mon Sep 17 00:00:00 2001
From: Guillaume Belz <gbelz@esri.com>
Date: Tue, 6 Dec 2022 11:45:29 -0800
Subject: [PATCH 1/2] fix build for Qt 6.4

---
 .../cpp/Esri/ArcGISRuntime/Toolkit/SearchSourceInterface.h   | 5 +++++
 .../Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp     | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/uitools/cpp/Esri/ArcGISRuntime/Toolkit/SearchSourceInterface.h b/uitools/cpp/Esri/ArcGISRuntime/Toolkit/SearchSourceInterface.h
index ba2a5039a..172597c11 100644
--- a/uitools/cpp/Esri/ArcGISRuntime/Toolkit/SearchSourceInterface.h
+++ b/uitools/cpp/Esri/ArcGISRuntime/Toolkit/SearchSourceInterface.h
@@ -25,6 +25,7 @@
 #include <QList>
 #include <QObject>
 #include <QString>
+#include <QQmlEngine>
 
 Q_MOC_INCLUDE("SearchResult.h")
 
@@ -43,7 +44,9 @@ namespace Esri::ArcGISRuntime::Toolkit {
   class SearchSourceInterface : public QObject
   {
     Q_OBJECT
+    QML_INTERFACE
     Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName NOTIFY displayNameChanged)
+
   public:
     SearchSourceInterface(QObject* parent = nullptr);
     ~SearchSourceInterface() override;
@@ -77,4 +80,6 @@ namespace Esri::ArcGISRuntime::Toolkit {
 
 } // Esri::ArcGISRuntime::Toolkit
 
+Q_DECLARE_INTERFACE(Esri::ArcGISRuntime::Toolkit::SearchSourceInterface, "Esri::ArcGISRuntime::Toolkit::SearchSourceInterface")
+
 #endif // ESRI_ARCGISRUNTIME_TOOLKIT_SEARCHSOURCEINTERFACE_H
diff --git a/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp b/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
index b1eb31dd9..4052f8db7 100644
--- a/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
+++ b/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
@@ -34,7 +34,6 @@
 #include "PopupViewController.h"
 #include "ScalebarController.h"
 #include "SearchResult.h"
-#include "SearchSourceInterface.h"
 #include "SearchSuggestion.h"
 #include "SearchViewController.h"
 #include "SmartLocatorSearchSource.h"
@@ -200,7 +199,6 @@ namespace Esri::ArcGISRuntime::Toolkit {
     registerComponent<PopupViewController>();
     registerComponent<ScalebarController>();
     registerComponent<SearchResult>();
-    registerComponent<SearchSourceInterface>(CreationType::Interface);
     registerComponent<SearchSuggestion>();
     registerComponent<SearchViewController>();
     registerComponent<SmartLocatorSearchSource>(CreationType::Uncreatable);

From afbbd2160b46e5642c68d0704c4186b21b3a3da3 Mon Sep 17 00:00:00 2001
From: Guillaume Belz <gbelz@esri.com>
Date: Tue, 6 Dec 2022 12:29:36 -0800
Subject: [PATCH 2/2] remove interface registration

---
 .../ArcGISRuntime/Toolkit/internal/register_cpp.cpp   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp b/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
index 4052f8db7..08f292f3f 100644
--- a/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
+++ b/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
@@ -112,17 +112,6 @@ namespace Esri::ArcGISRuntime::Toolkit {
 
       constexpr Uncreatable_ Uncreatable = Uncreatable_{};
 
-      struct Interface_
-      {
-      };
-
-      template <class T>
-      void registerComponentImpl(CreationType::Interface_, int majorVersion, int /*minorVersion*/, const char* /*name*/)
-      {
-        qmlRegisterInterface<T>(NAMESPACE, majorVersion);
-      }
-
-      constexpr Interface_ Interface = Interface_{};
     }
 
     /*