From 7c4f5c5f1ef120df70f1bc7f206d79aecdbcee92 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Fri, 26 Jun 2020 16:20:40 +0200 Subject: [PATCH] Port away from deprecated qmlRegisterInterface<>() overload GIT_SILENT --- src/declarativeimports/core/corebindingsplugin.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/declarativeimports/core/corebindingsplugin.cpp b/src/declarativeimports/core/corebindingsplugin.cpp index 4cd4f6b30..9a7886db7 100644 --- a/src/declarativeimports/core/corebindingsplugin.cpp +++ b/src/declarativeimports/core/corebindingsplugin.cpp @@ -96,9 +96,17 @@ void CoreBindingsPlugin::registerTypes(const char *uri) qmlRegisterRevision(uri, 2, 0); qmlRegisterType(uri, 2, 0, "ToolTipArea"); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + qmlRegisterInterface(uri, 1); +#else qmlRegisterInterface("Service"); +#endif qRegisterMetaType("Service"); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + qmlRegisterInterface(uri, 1); +#else qmlRegisterInterface("ServiceJob"); +#endif qRegisterMetaType("ServiceJob"); qmlRegisterType(uri, 2, 0, "ServiceOperationStatus"); #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) @@ -114,7 +122,11 @@ void CoreBindingsPlugin::registerTypes(const char *uri) #endif qmlRegisterType(uri, 2, 0, "IconItem"); +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + qmlRegisterInterface(uri, 1); +#else qmlRegisterInterface("DataSource"); +#endif qRegisterMetaType("DataSource"); qmlRegisterType(uri, 2, 0, "WindowThumbnail");