diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:28:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:28:48 +0200 |
| commit | 5517c63c2eb601f3a9a2cb1e43d21b5e662b18cc (patch) | |
| tree | 9b8e50a5312dc17d388f3425ffb9ea9fb0db6bef /examples/examples.pro | |
| parent | c3cbbf362c769b065fd0586b0510d043cbae92a4 (diff) | |
| parent | 45f79dc7e572c1a1e4c40633d5055d0c6741cfbe (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/qml/qqmlcomponent.cpp
tests/auto/quick/scenegraph/tst_scenegraph.cpp
Change-Id: Ibc811b95a57f175ca53337db7bbd1f575a745937
Diffstat (limited to 'examples/examples.pro')
0 files changed, 0 insertions, 0 deletions