From 7dc0de374300d66ed72f15820a4ebb78849ae0e7 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Thu, 16 Apr 2020 14:40:02 +0200
Subject: Make qdoc generate the documentation for qmlRegisterSingletonType

I *guess* it wasn't find the "dummy" signature spelled in the docs,
but only the actual one (with SFINAE), so the overload ended up
being undocumented.

Change-Id: I3c48057860c83dc78107e87b93616415976e802f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qml/qml/qqml.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index b2bf1f328f..a8042a9cad 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -658,10 +658,15 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi
     return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api);
 }
 
+#ifdef Q_QDOC
+template <typename T>
+int qmlRegisterSingletonType(const char *uri, int versionMajor, int versionMinor, const char *typeName, std::function<QObject*(QQmlEngine *, QJSEngine *)> callback)
+#else
 template <typename T, typename F, typename std::enable_if<std::is_convertible<F, std::function<QObject *(QQmlEngine *, QJSEngine *)>>::value
                                                  && !std::is_convertible<F, QObject *(*)(QQmlEngine *, QJSEngine *)>::value, void>::type* = nullptr>
 inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versionMinor, const char *typeName,
                                     F&& callback)
+#endif
 {
 
     QML_GETTYPENAMES
-- 
cgit v1.2.3