diff options
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqml.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 04d907f168..0ff0de1ef9 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -906,7 +906,7 @@ */ /*! - \fn template<typename T> auto qmlRegisterSingletonInstance(const char *uri, int versionMajor, int versionMinor, const char *typeName, T *cppObject) + \fn int qmlRegisterSingletonInstance(const char *uri, int versionMajor, int versionMinor, const char *typeName, QObject *cppObject) \relates QQmlEngine \since 5.14 diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index a3e3f1c584..4adf100a1f 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -754,9 +754,14 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api); } +#ifdef Q_QDOC +int qmlRegisterSingletonInstance(const char *uri, int versionMajor, int versionMinor, + const char *typeName, QObject *cppObject) +#else template<typename T> inline auto qmlRegisterSingletonInstance(const char *uri, int versionMajor, int versionMinor, const char *typeName, T *cppObject) -> typename std::enable_if<std::is_base_of<QObject, T>::value, int>::type +#endif { QQmlPrivate::RegisterSingletonFunctor registrationFunctor; registrationFunctor.m_object = cppObject; |