diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 13:14:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 13:14:04 +0200 |
| commit | 6839f03051d2950e4721cbb5ee88fa7b07109588 (patch) | |
| tree | d5cdfeeb6e59953f5109ef87a1be08f69fcddf7a /examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp | |
| parent | cc5ead1b3c8ce79c240b70bdfcfb687fe60e50f5 (diff) | |
| parent | fe92db0a0eeed502ef851930b3404b38c4a03f4f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/quick/qquickitem/tst_qquickitem.cpp
Change-Id: If261f8eea84dfa5944bb55de999d1f70aba528fd
Diffstat (limited to 'examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp')
0 files changed, 0 insertions, 0 deletions