Skip to content

Commit 33f2874

Browse files
Revert "fix toolkit build for Qt 6.4"
This reverts commit 863ce9e.
1 parent 863ce9e commit 33f2874

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

uitools/cpp/Esri/ArcGISRuntime/Toolkit/SearchSourceInterface.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <QList>
2626
#include <QObject>
2727
#include <QString>
28-
#include <QQmlEngine>
2928

3029
Q_MOC_INCLUDE("SearchResult.h")
3130

@@ -44,9 +43,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
4443
class SearchSourceInterface : public QObject
4544
{
4645
Q_OBJECT
47-
QML_INTERFACE
4846
Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName NOTIFY displayNameChanged)
49-
5047
public:
5148
SearchSourceInterface(QObject* parent = nullptr);
5249
~SearchSourceInterface() override;
@@ -80,6 +77,4 @@ namespace Esri::ArcGISRuntime::Toolkit {
8077

8178
} // Esri::ArcGISRuntime::Toolkit
8279

83-
Q_DECLARE_INTERFACE(Esri::ArcGISRuntime::Toolkit::SearchSourceInterface, "Esri::ArcGISRuntime::Toolkit::SearchSourceInterface")
84-
8580
#endif // ESRI_ARCGISRUNTIME_TOOLKIT_SEARCHSOURCEINTERFACE_H

uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "PopupViewController.h"
3535
#include "ScalebarController.h"
3636
#include "SearchResult.h"
37+
#include "SearchSourceInterface.h"
3738
#include "SearchSuggestion.h"
3839
#include "SearchViewController.h"
3940
#include "SmartLocatorSearchSource.h"
@@ -199,6 +200,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
199200
registerComponent<PopupViewController>();
200201
registerComponent<ScalebarController>();
201202
registerComponent<SearchResult>();
203+
registerComponent<SearchSourceInterface>(CreationType::Interface);
202204
registerComponent<SearchSuggestion>();
203205
registerComponent<SearchViewController>();
204206
registerComponent<SmartLocatorSearchSource>(CreationType::Uncreatable);

0 commit comments

Comments
 (0)