Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.6' into 5.7 · 03a6177a
    Liang Qi authored
    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
    03a6177a