Skip to content
Blame History Permalink
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.6' into 5.7 · d352d707
    Liang Qi authored 
    Conflicts:
	.qmake.conf
	README
	src/charts/qchartglobal.h
	tests/auto/chartdataset/tst_chartdataset.cpp
	tests/auto/domain/tst_domain.cpp

Change-Id: Ib4e01f2646d87b691c7b2f8bee4ed1f5521e4f6d
    d352d707