diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
commit | 50aeedd86ce0244fbb77ebefdce8da72db881e45 (patch) | |
tree | 209b0e39b8bde2e43da9497ab327767679ebbdb6 /examples/widgets/graphicsview/diagramscene/diagramitem.h | |
parent | 08dea594fe4a55d7546a17773f84f44de2c2d200 (diff) | |
parent | 17d72c783747dd8d9ce767002988d5d5a54a790e (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
src/corelib/tools/qdatetimeparser_p.h
Change-Id: I5382cee3ddb33107dc61ee20f7a9188c4a68a882
Diffstat (limited to 'examples/widgets/graphicsview/diagramscene/diagramitem.h')
0 files changed, 0 insertions, 0 deletions