diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-23 12:09:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 11:13:09 +0200 |
| commit | 15dd1b7883f5dbe66266aeb588381f85f3532ab9 (patch) | |
| tree | 1fa8caa8ec0f38aef39bcf920e3d5c7efeae5cb9 /src/qml/qml/qqmlmetatype_p.h | |
| parent | f82c4de515223574bcc510de0d993426b22bccbe (diff) | |
| parent | ebceda0cad6d86f6d6fe5efbf85a3b06fb4222b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h
src/qml/qml/qqmltypenamecache.cpp
Done-with: Ulf Hermann<ulf.hermann@qt.io>
Change-Id: I41ba7a592b2659ddf53da6952ea3b456a7bba319
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 720c6d904a..85ee4d7b97 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -260,7 +260,8 @@ public: SingletonType = 1, InterfaceType = 2, CompositeType = 3, - CompositeSingletonType = 4 + CompositeSingletonType = 4, + AnyRegistrationType = 255 }; private: |