diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-14 08:54:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-14 08:54:57 +0100 |
| commit | 172260ebef6b830768468317deee5e05743f92f3 (patch) | |
| tree | f5bf99ecfecddcf0d07c5017b27d3e8f14d41176 /src/qml/qml/qqmlimport.cpp | |
| parent | 9fbc5aa8866bbc19cc0db9f5f247276f36f3e283 (diff) | |
| parent | 8bf579d8d4feb13ca8651e98dd762b28483abe9e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I905dcd29377bf1b2e0ee086823b54277d18e78dd
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
0 files changed, 0 insertions, 0 deletions