diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 13:42:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 13:42:08 +0100 |
| commit | 3832b1e05b80a0f509be17dd3619a2f8bb70074f (patch) | |
| tree | 3763c243b13c8228b1508ce5902dc2f587cabfdd /tests/auto/qml/qqmlengine | |
| parent | f9fae251ca07401ee1b0039edc6ea6b7a522b5a7 (diff) | |
| parent | 5c53861cced2d40490e4c7bfc202aadc532df4c2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tests/auto/qml/qml.pro
tools/qmlprofiler/qmlprofilerclient.cpp
Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
Diffstat (limited to 'tests/auto/qml/qqmlengine')
0 files changed, 0 insertions, 0 deletions