diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-07 07:17:40 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-07 07:17:40 +0100 |
| commit | 50bce248ab6ec4d1e39b85029297dc5d5d80f195 (patch) | |
| tree | f52c9ac36ccfdfb00c332914f602186d0c3b8bd7 /src/qml/qml/qqmltypeloader.cpp | |
| parent | a428a2199f4ce75d68585cabe3471356933fa404 (diff) | |
| parent | e87ecaf55291ac38c705dea7eaeb7c58ad0e3284 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
tests/auto/quick/qquickloader/tst_qquickloader.cpp
Change-Id: I85fd38cfa00cd60197a1c981bfcc16fcb896cfe9
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
0 files changed, 0 insertions, 0 deletions