From 61406f76198e2cd503d54b095a22a4a6ffbdcb4c Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Wed, 18 Mar 2020 14:39:48 +0100
Subject: qmlRegisterSingletonInstance: show user-friendly signature in
 documentation

Change-Id: I50ee4c014acf3f95d00a38c6d115776143688c8e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/qml/qqml.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/qml/qml/qqml.h')

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;
-- 
cgit v1.2.3