diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
| commit | 0ae26f8c574411cbab748128a317cc08dafe2382 (patch) | |
| tree | 41437d5d0ff7cc714ff37be23b25ca7ce6b792a6 /src/qml/qml/qqml.h | |
| parent | d4042c8cd82b35b3ec67c4309d80c9c92f55d889 (diff) | |
| parent | 3ed33ec74b70bbac016dd080889bb3df3a78d90c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: If1868d27ea40fdc206971c2f7a24e91c5e62b1bf
Diffstat (limited to 'src/qml/qml/qqml.h')
| -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 4957c12036..9c896e6322 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -746,8 +746,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, |