diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:15:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:15:50 +0100 |
| commit | 85793744503112e13abe47b31d108f6b6ee998d9 (patch) | |
| tree | b818e39a8ff6fa024f81a374724b9fd6e5100d56 /tests/manual/candlesticktester/mainwidget.cpp | |
| parent | dad8cdbac13eaf3ed33fdf4157ebc242d5c13db5 (diff) | |
| parent | ab6f94d6fb186d0003679fb4541c939555fd01c9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
tests/manual/chartwidgettest/mainwidget.cpp
tests/manual/wavechart/wavechart.cpp
Change-Id: I18962ddc37a91daa23571eb04e35eec828aceef8
Diffstat (limited to 'tests/manual/candlesticktester/mainwidget.cpp')
0 files changed, 0 insertions, 0 deletions