Qt>5.15: Deprecated QMetaType::typeName() -> QMetaType(type).name()

lainwir3d · lainwir3d · commit 211ad01a7b47 · 2022-05-27T15:31:22.000+02:00
diff --git a/src/imports/restclient/qmlgenericrestreply.cpp b/src/imports/restclient/qmlgenericrestreply.cpp
@@ -13,12 +13,20 @@ QtRestClient::QmlGenericRestReply::QmlGenericRestReply(SerializerBase *serialize
 
 QString QtRestClient::QmlGenericRestReply::returnType() const
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	return QString::fromUtf8(QMetaType::typeName(_returnType));
+#else
+	return QString::fromUtf8(QMetaType(_returnType).name());
+#endif
 }
 
 QString QtRestClient::QmlGenericRestReply::errorType() const
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	return QString::fromUtf8(QMetaType::typeName(_errorType));
+#else
+	return QString::fromUtf8(QMetaType(_errorType).name());
+#endif
 }
 
 void QtRestClient::QmlGenericRestReply::addCompletedHandler(const QJSValue &completedHandler)

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,20 @@ QtRestClient::QmlGenericRestReply::QmlGenericRestReply(SerializerBase *serialize`
`13`	`13`
`14`	`14`	`QString QtRestClient::QmlGenericRestReply::returnType() const`
`15`	`15`	`{`
	`16`	`+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)`
`16`	`17`	`return QString::fromUtf8(QMetaType::typeName(_returnType));`
	`18`	`+#else`
	`19`	`+ return QString::fromUtf8(QMetaType(_returnType).name());`
	`20`	`+#endif`
`17`	`21`	`}`
`18`	`22`
`19`	`23`	`QString QtRestClient::QmlGenericRestReply::errorType() const`
`20`	`24`	`{`
	`25`	`+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)`
`21`	`26`	`return QString::fromUtf8(QMetaType::typeName(_errorType));`
	`27`	`+#else`
	`28`	`+ return QString::fromUtf8(QMetaType(_errorType).name());`
	`29`	`+#endif`
`22`	`30`	`}`
`23`	`31`
`24`	`32`	`void QtRestClient::QmlGenericRestReply::addCompletedHandler(const QJSValue &completedHandler)`