diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-27 09:23:32 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-27 10:43:12 +0200 |
| commit | 8c524894f8c46684d23fa990c65e9546caa76e2c (patch) | |
| tree | 0b18d5f9b7257717f069f8255415f7dfbac4fc1a | |
| parent | 3249ad6deff70eadf998faaac04bd2be5b6674f6 (diff) | |
| parent | a0ab037c69821dc2aa8f8bed70dfc6b75bc5b35b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15.0
Conflicts:
src/qml/qml/qqml.h
Change-Id: I34295e4ea3fc9ec2a42cb93df498d54a5583ddf1
| -rw-r--r-- | src/qml/qml/qqml.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 1621e3c02e..5ea1d17478 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -760,8 +760,7 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi } #ifdef Q_QDOC -int qmlRegisterSingletonInstance(const char *uri, int versionMajor, int versionMinor, - const char *typeName, QObject *cppObject) +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, |