Merge pull request #576 from Esri/guil8553/7852-qt641

fix build for Qt 6.4
Esri · Dec 6, 2022 · 43572a5 · 43572a5
2 parents 33f2874 + afbbd21
commit 43572a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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"
@@ -113,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_{};
     }
 
     /*
@@ -200,7 +188,6 @@ namespace Esri::ArcGISRuntime::Toolkit {
     registerComponent<PopupViewController>();
     registerComponent<ScalebarController>();
     registerComponent<SearchResult>();
-    registerComponent<SearchSourceInterface>(CreationType::Interface);
     registerComponent<SearchSuggestion>();
     registerComponent<SearchViewController>();
     registerComponent<SmartLocatorSearchSource>(CreationType::Uncreatable);