diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-22 07:34:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-22 07:34:02 +0200 |
| commit | 1dafbae0006de63621b7721cca7557756fcfd8ba (patch) | |
| tree | c127743200fb1696e146aa782826b886ab6b6794 /src/qml/qml/qqml.h | |
| parent | 5728f48834b9225a36d3e1dae44ced7579cde358 (diff) | |
| parent | 6555642db7b3b992335f98dc01863db4beea3fd4 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iafb7061945e011542fbf0f6ebe776f0a4187b0a4
Diffstat (limited to 'src/qml/qml/qqml.h')
| -rw-r--r-- | src/qml/qml/qqml.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 76a4740101..252e4a5baf 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -716,10 +716,15 @@ inline int qmlRegisterSingletonType( 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 { QQmlPrivate::RegisterSingletonType api = { 0, |