##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1
Liang Qi -
r2898:03a6177a3223 merge master
Show More
Name Size Modified Last Commit Author
/ src / charts / doc / images
api_category_axis.png Loading ...
api_datatime_axis.png Loading ...
arrow_down.png Loading ...
bg.png Loading ...
breadcrumb.png Loading ...
bullet_dn.png Loading ...
bullet_gt.png Loading ...
bullet_sq.png Loading ...
bullet_up.png Loading ...
digia_logo.png Loading ...
examples_areachart.png Loading ...
examples_audio.png Loading ...
examples_barchart.png Loading ...
examples_barmodelmapper.png Loading ...
examples_boxplotchart.png Loading ...
examples_callout.png Loading ...
examples_chartthemes_blue_cerulean.png Loading ...
examples_chartthemes_brown_sand.png Loading ...
examples_chartthemes_light.png Loading ...
examples_customchart.png Loading ...
examples_datetimeaxis.png Loading ...
examples_donutbreakdown.png Loading ...
examples_donutchart.png Loading ...
examples_dynamicspline1.png Loading ...
examples_dynamicspline2.png Loading ...
examples_horizontalbarchart.png Loading ...
examples_horizontalpercentbarchart.png Loading ...
examples_horizontalstackedbarchart.png Loading ...
examples_legend_detach.png Loading ...
examples_legend_detach2.png Loading ...
examples_legendmarkers.png Loading ...
examples_lineandbar.png Loading ...
examples_linechart.png Loading ...
examples_logvalueaxis.png Loading ...
examples_modeldata.png Loading ...
examples_multiaxis.png Loading ...
examples_nesteddonuts.png Loading ...
examples_openglseries.png Loading ...
examples_percentbarchart.png Loading ...
examples_percentbarchart_legend.png Loading ...
examples_piechart.png Loading ...
examples_piechartdrill1.png Loading ...
examples_piechartdrill2.png Loading ...
examples_polarchart.png Loading ...
examples_qmlaxes1.png Loading ...
examples_qmlaxes2.png Loading ...
examples_qmlaxes3.png Loading ...
examples_qmlboxplot.png Loading ...
examples_qmlchart1.png Loading ...
examples_qmlchart10.png Loading ...
examples_qmlchart11.png Loading ...
examples_qmlchart12.png Loading ...
examples_qmlchart2.png Loading ...
examples_qmlchart3.png Loading ...
examples_qmlchart4.png Loading ...
examples_qmlchart5.png Loading ...
examples_qmlchart6.png Loading ...
examples_qmlchart7.png Loading ...
examples_qmlchart8.png Loading ...
examples_qmlchart9.png Loading ...
examples_qmlcustomizations.png Loading ...
examples_qmlcustomlegend1.png Loading ...
examples_qmlcustomlegend2.png Loading ...
examples_qmlcustomlegend3.png Loading ...
examples_qmlcustommodel.png Loading ...
examples_qmlf1legends.png Loading ...
examples_qmloscilloscope.png Loading ...
examples_qmlpiechart.png Loading ...
examples_qmlpolarchart1.png Loading ...
examples_qmlpolarchart2.png Loading ...
examples_qmlpolarchart3.png Loading ...
examples_qmlweather.png Loading ...
examples_scatterchart.png Loading ...
examples_scatterinteractions.png Loading ...
examples_splinechart.png Loading ...
examples_stackedbarchart.png Loading ...
examples_stackedbarchartdrilldown1.png Loading ...
examples_stackedbarchartdrilldown2.png Loading ...
examples_temperaturerecords.png Loading ...
examples_zoomlinechart1.png Loading ...
examples_zoomlinechart2.png Loading ...
horBar.png Loading ...
piechart_customization.png Loading ...
qcharts.png Loading ...
qt-logo.png Loading ...