diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-22 11:17:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-22 11:17:34 +0100 |
| commit | 9e943f147c7b608b75bb2419d12dd8d704f79ea9 (patch) | |
| tree | cf7d7599e642ce817811550d25b5eaf012be35ca | |
| parent | d63f5bd20034812b7661d6f2beb7f0025333953d (diff) | |
| parent | 70baf5bc141d022f3cd99216c4628c9e38663d4d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/charts/animations/baranimation.cpp
src/charts/animations/boxwhiskersanimation.cpp
src/charts/axis/cartesianchartaxis.cpp
src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
src/charts/piechart/qpieslice.cpp
Change-Id: I08f8c3c303dd578290b3dda076327ed6a19e4be0
0 files changed, 0 insertions, 0 deletions